From 00ee3bc1f5703d9f4b9b568f0abee6c5403a8a05 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 3 Apr 2019 14:48:22 +0200 Subject: fix disting rules --- src/namestore/test_namestore_delete.sh | 6 +++--- src/namestore/test_namestore_lookup.sh | 28 ++++++++++------------------ src/namestore/test_namestore_put.sh | 2 +- 3 files changed, 14 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/namestore/test_namestore_delete.sh b/src/namestore/test_namestore_delete.sh index 8c776104a..44ea1e66c 100755 --- a/src/namestore/test_namestore_delete.sh +++ b/src/namestore/test_namestore_delete.sh @@ -61,15 +61,15 @@ for LINE in $OUTPUT ; stop_peer -if [ $FOUND_NAME == false -a $FOUND_IP != false ] +if [ $FOUND_NAME = false -a $FOUND_IP != false ] then echo "PASS: Delete name in namestore" exit 0 -elif [ $FOUND_NAME == true ] +elif [ $FOUND_NAME = true ] then echo "FAIL: Delete name in namestore: name returned" exit 1 -elif [ $FOUND_IP == true ] +elif [ $FOUND_IP = true ] then echo "FAIL: Delete name in namestore: IP returned" exit 1 diff --git a/src/namestore/test_namestore_lookup.sh b/src/namestore/test_namestore_lookup.sh index 90735b17e..1c96e102a 100755 --- a/src/namestore/test_namestore_lookup.sh +++ b/src/namestore/test_namestore_lookup.sh @@ -19,20 +19,10 @@ TEST_IP_PLUS="127.0.0.1" TEST_RECORD_NAME_DNS="www3" which timeout &> /dev/null && DO_TIMEOUT="timeout 5" -function start_peer -{ - gnunet-arm -s -c $CONFIGURATION - gnunet-identity -C testego -c $CONFIGURATION -} +# start peer +gnunet-arm -s -c $CONFIGURATION +gnunet-identity -C testego -c $CONFIGURATION -function stop_peer -{ - gnunet-identity -D testego -c $CONFIGURATION - gnunet-arm -e -c $CONFIGURATION -} - - -start_peer # Create a public record gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME_DNS -t A -V $TEST_IP_PLUS -e never -c $CONFIGURATION NAMESTORE_RES=$? @@ -52,19 +42,21 @@ for LINE in $OUTPUT ; FOUND_IP=true; #echo $FOUND_IP fi - done -stop_peer +done +# stop peer +gnunet-identity -D testego -c $CONFIGURATION +gnunet-arm -e -c $CONFIGURATION -if [ $FOUND_NAME == true -a $FOUND_IP == true ] +if [ $FOUND_NAME = true -a $FOUND_IP = true ] then echo "PASS: Lookup name in namestore" exit 0 -elif [ $FOUND_NAME == false ] +elif [ $FOUND_NAME = false ] then echo "FAIL: Lookup name in namestore: name not returned" exit 1 -elif [ $FOUND_IP == false ] +elif [ $FOUND_IP = false ] then echo "FAIL: Lookup name in namestore: IP not returned" exit 1 diff --git a/src/namestore/test_namestore_put.sh b/src/namestore/test_namestore_put.sh index 6b6647d5f..eaf7d44b4 100755 --- a/src/namestore/test_namestore_put.sh +++ b/src/namestore/test_namestore_put.sh @@ -46,7 +46,7 @@ gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME_DNS -t A -V $TEST_IP_PLUS NAMESTORE_RES=$? stop_peer -if [ $NAMESTORE_RES == 0 ] +if [ $NAMESTORE_RES = 0 ] then echo "PASS: Creating name in namestore" else -- cgit v1.2.3