test/run: Enforce single variable substitution method

There is no need to have two ways to access environment variables
from test cases, one is enough.

3 files changed, 9 insertions, 3 deletions

diff --git a/quilt.changes b/quilt.changes
index e9ca757..dc0a981 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri Mar 18 12:05:33 CET 2011 - jdelvare@suse.de
+
+-  test/run: Enforce single variable substitution method. There is
+   no need to have two ways to access environment variables from
+   test cases, one is enough.
+
+-------------------------------------------------------------------
 Fri Mar 18 11:55:17 CET 2011 - jdelvare@suse.de
 
 - Makefile.in: Fix i18n of quilt/scripts/patchfns, broken by
diff --git a/test/edit.test b/test/edit.test
index 1c0c500..eb38b7a 100644
--- a/test/edit.test
+++ b/test/edit.test
@@ -6,7 +6,7 @@ $ cat > editor
 < sed -e 's:foo:bar:' $1 > $1.new
 < mv $1.new $1
 $ chmod +x editor
-$ export EDITOR=%PWD/editor
+$ export EDITOR=%{PWD}/editor
 
 $ quilt new patch
 > Patch patches/patch is now on top
diff --git a/test/run b/test/run
index 0ed950e..85acb0e 100755
--- a/test/run
+++ b/test/run
@@ -83,8 +83,7 @@ if (defined $ARGV[0]) {
 for (;;) {
   my $line = <SOURCE>; $lineno++;
   if (defined $line) {
-    # Substitute %VAR and %{VAR} with environment variables.
-    $line =~ s[%(\w+)][$ENV{$1}]eg;
+    # Substitute %{VAR} with environment variables.
     $line =~ s[%{(\w+)}][$ENV{$1}]eg;
   }
   if (defined $line) {