about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-26T21·36-0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-26T21·36-0400
commit50395b71a90314abfcc39d8343dbaa8e9aa199a6 (patch)
tree8f424e4cff92252bd4dfacb3c8f7ec0bd5954ec8 /tests
parente3ce54cceedb9a3144c4eccfbafd63ed765d8913 (diff)
Fix the substituter tests
Diffstat (limited to 'tests')
-rwxr-xr-xtests/substituter.sh31
-rwxr-xr-xtests/substituter2.sh32
2 files changed, 34 insertions, 29 deletions
diff --git a/tests/substituter.sh b/tests/substituter.sh
index 65c4fa1856d0..a6bdacfd66f7 100755
--- a/tests/substituter.sh
+++ b/tests/substituter.sh
@@ -2,22 +2,25 @@
 echo substituter args: $* >&2
 
 if test $1 = "--query"; then
-    while read cmd; do
-        echo FOO $cmd >&2
+    while read cmd args; do
+        echo "CMD = $cmd, ARGS = $args" >&2
         if test "$cmd" = "have"; then
-            read path
-            if grep -q "$path" $TEST_ROOT/sub-paths; then
-                echo 1
-            else
-                echo 0
-            fi
+            for path in $args; do 
+                read path
+                if grep -q "$path" $TEST_ROOT/sub-paths; then
+                    echo $path
+                fi
+            done
+            echo
         elif test "$cmd" = "info"; then
-            read path
-            echo 1
-            echo "" # deriver
-            echo 0 # nr of refs
-            echo $((1 * 1024 * 1024)) # download size
-            echo $((2 * 1024 * 1024)) # nar size
+            for path in $args; do
+                echo $path
+                echo "" # deriver
+                echo 0 # nr of refs
+                echo $((1 * 1024 * 1024)) # download size
+                echo $((2 * 1024 * 1024)) # nar size
+            done
+            echo
         else
             echo "bad command $cmd"
             exit 1
diff --git a/tests/substituter2.sh b/tests/substituter2.sh
index c56a1bc47b5c..34b2c0eafaf8 100755
--- a/tests/substituter2.sh
+++ b/tests/substituter2.sh
@@ -2,21 +2,23 @@
 echo substituter2 args: $* >&2
 
 if test $1 = "--query"; then
-    while read cmd; do
-        if test "$cmd" = "have"; then
-            read path
-            if grep -q "$path" $TEST_ROOT/sub-paths; then
-                echo 1
-            else
-                echo 0
-            fi
-        elif test "$cmd" = "info"; then
-            read path
-            echo 1
-            echo "" # deriver
-            echo 0 # nr of refs
-            echo 0 # download size
-            echo 0 # nar size
+    while read cmd args; do
+        if test "$cmd" = have; then
+            for path in $args; do
+                if grep -q "$path" $TEST_ROOT/sub-paths; then
+                    echo $path
+                fi
+            done
+            echo
+        elif test "$cmd" = info; then
+            for path in $args; do
+                echo $path
+                echo "" # deriver
+                echo 0 # nr of refs
+                echo 0 # download size
+                echo 0 # nar size
+            done
+            echo
         else
             echo "bad command $cmd"
             exit 1