Fix the substituter tests

1 files changed, 17 insertions, 14 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