From: Kornel Benko Date: Sat, 30 Mar 2019 11:01:16 +0000 (+0100) Subject: Cmate tests: Use absolute values for systemlyxdir X-Git-Tag: lyx-2.4.0dev-acb2ca7b~2287 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=743c28e6f543c7626715277ea7c0e126761f20a8;p=lyx.git Cmate tests: Use absolute values for systemlyxdir This omits use of relative path for the \origin variable inside the test-build-dir. --- diff --git a/development/autotests/lyxStatus.pm b/development/autotests/lyxStatus.pm index 6c3001953f..0c6677691c 100644 --- a/development/autotests/lyxStatus.pm +++ b/development/autotests/lyxStatus.pm @@ -37,6 +37,7 @@ my @stack = (); # list of HASH-Arrays my $rFont = {}; my $useNonTexFont = "true"; my $inputEncoding = undef; +my $sysdir = undef; # The elements are: # type (layout, inset, header, preamble, ...) @@ -52,6 +53,8 @@ my $inputEncoding = undef; sub initLyxStack($$$) { + use Cwd 'abs_path'; + $rFont = $_[0]; if ($_[1] eq "systemF") { $useNonTexFont = "true"; @@ -64,6 +67,11 @@ sub initLyxStack($$$) $inputEncoding = $_[2]; } $stack[0] = { type => "Starting"}; + my $p = abs_path( __FILE__ ); + $p =~ s/\/development\/autotests\/.*$/\/lib/; + # Save the value to be used as replacement for systemlyxdir in \origin statements + $sysdir = $p; + # print "Sysdir set to $sysdir\n"; } sub diestack($) @@ -235,6 +243,10 @@ sub checkForHeader($) "result" => ["\\inputencoding " . $inputEncoding->{out}]); push(@rElems, $inputenc); } + my $origin = newMatch("search" => qr/^\\origin\s+(\/systemlyxdir)(.*)$/, + "filetype" => "replace_only", + "result" => ["\\origin $sysdir", "2"]); + push(@rElems, $origin); setMatching(\@rElems); return(1); }