Expand ${PWD} in the vgopts: line of .vgtest files.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11311

diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in
index 15c53f14a5a6796afa57e58cb45e4fe44a0f1272..adf3b9aadfa15aabf5d91324c1b25ce64cdba81e 100755 (executable)
--- a/tests/vg_regtest.in
+++ b/tests/vg_regtest.in
@@ -217,7 +217,9 @@ sub read_vgtest_file($)
         if      ($line =~ /^\s*#/ || $line =~ /^\s*$/) {
            next;
        } elsif ($line =~ /^\s*vgopts:\s*(.*)$/) {
-            $vgopts = $vgopts . " " . $1;   # Nb: Make sure there's a space!
+            my $addvgopts = $1;
+            $addvgopts =~ s/\${PWD}/$ENV{PWD}/g;
+            $vgopts = $vgopts . " " . $addvgopts;   # Nb: Make sure there's a space!
         } elsif ($line =~ /^\s*prog:\s*(.*)$/) {
             $prog = validate_program(".", $1, 0, 0);
         } elsif ($line =~ /^\s*args:\s*(.*)$/) {