[Quilt-dev] [PATCH] test/run: Enforce single variable substitution method

[Jean Delvare]

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

Signed-off-by: Jean Delvare <address@hidden>
---
Objection anyone? Andreas?

 test/edit.test |    2 +-
 test/run       |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

--- 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
--- 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) {

-- 
Jean Delvare
Suse L3