diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/substituter.sh | 27 | ||||
| -rwxr-xr-x | tests/substituter2.sh | 26 |
2 files changed, 37 insertions, 16 deletions
diff --git a/tests/substituter.sh b/tests/substituter.sh index 96fb95b91f6b..b244b30e83a8 100755 --- a/tests/substituter.sh +++ b/tests/substituter.sh @@ -1,14 +1,25 @@ #! /bin/sh -e echo substituter args: $* >&2 -if test $1 = "--query-paths"; then - cat $TEST_ROOT/sub-paths -elif test $1 = "--query-info"; then - shift - for i in in $@; do - echo $i - echo "" # deriver - echo 0 # nr of refs +if test $1 = "--query"; then + while read cmd; do + echo FOO $cmd >&2 + 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 + else + echo "bad command $cmd" + exit 1 + fi done elif test $1 = "--substitute"; then mkdir $2 diff --git a/tests/substituter2.sh b/tests/substituter2.sh index 1bcf65a54d0e..401e7b7befbd 100755 --- a/tests/substituter2.sh +++ b/tests/substituter2.sh @@ -1,14 +1,24 @@ #! /bin/sh -e echo substituter2 args: $* >&2 -if test $1 = "--query-paths"; then - cat $TEST_ROOT/sub-paths -elif test $1 = "--query-info"; then - shift - for i in in $@; do - echo $i - echo "" # deriver - echo 0 # nr of refs +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 + else + echo "bad command $cmd" + exit 1 + fi done elif test $1 = "--substitute"; then exit 1 |