From: Bart Van Assche <bvanassche@acm.org>
Date: Tue, 31 Aug 2010 15:15:35 +0000 (+0000)
Subject: Expand ${PWD} in the vgopts: line of .vgtest files.
X-Git-Tag: svn/VALGRIND_3_6_0~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c9590f939e199fc48bba7410dbac429750e29f8;p=thirdparty%2Fvalgrind.git

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 15c53f14a5..adf3b9aadf 100755
--- 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*(.*)$/) {