Change gnunet-config detection in gns tests

16 files changed, 96 insertions, 16 deletions

diff --git a/src/gns/test_gns_cname_lookup.sh b/src/gns/test_gns_cname_lookup.sh
index 1a4c10268..cbd50cdeb 100755
--- a/src/gns/test_gns_cname_lookup.sh
+++ b/src/gns/test_gns_cname_lookup.sh
@@ -4,8 +4,13 @@ trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
 then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version
+if test $? != 0
+then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 1
+        exit 77
 fi
 
 rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
diff --git a/src/gns/test_gns_delegated_lookup.sh b/src/gns/test_gns_delegated_lookup.sh
index c949ca7dc..7f22a70b5 100755
--- a/src/gns/test_gns_delegated_lookup.sh
+++ b/src/gns/test_gns_delegated_lookup.sh
@@ -5,8 +5,13 @@ which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
 then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version
+if test $? != 0
+then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 1
+        exit 77
 fi
 
 rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
diff --git a/src/gns/test_gns_dht_lookup.sh b/src/gns/test_gns_dht_lookup.sh
index e2b025f86..39023b077 100755
--- a/src/gns/test_gns_dht_lookup.sh
+++ b/src/gns/test_gns_dht_lookup.sh
@@ -5,8 +5,13 @@ which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
 then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version
+if test $? != 0
+then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 1
+        exit 77
 fi
 
 TEST_IP="127.0.0.1"
diff --git a/src/gns/test_gns_gns2dns_lookup.sh b/src/gns/test_gns_gns2dns_lookup.sh
index fa48fb20a..96505e9e2 100755
--- a/src/gns/test_gns_gns2dns_lookup.sh
+++ b/src/gns/test_gns_gns2dns_lookup.sh
@@ -4,8 +4,13 @@ trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
 then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version
+if test $? != 0
+then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 1
+        exit 77
 fi
 
 rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
diff --git a/src/gns/test_gns_ipv6_lookup.sh b/src/gns/test_gns_ipv6_lookup.sh
index 8f1a3f109..ffee8409e 100755
--- a/src/gns/test_gns_ipv6_lookup.sh
+++ b/src/gns/test_gns_ipv6_lookup.sh
@@ -4,8 +4,13 @@ trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
 then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version
+if test $? != 0
+then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 1
+        exit 77
 fi
 
 rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
diff --git a/src/gns/test_gns_lookup.sh b/src/gns/test_gns_lookup.sh
index 6a91e78a4..5f21fa7d6 100755
--- a/src/gns/test_gns_lookup.sh
+++ b/src/gns/test_gns_lookup.sh
@@ -4,8 +4,13 @@ trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
 then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version
+if test $? != 0
+then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 1
+        exit 77
 fi
 
 rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
diff --git a/src/gns/test_gns_mx_lookup.sh b/src/gns/test_gns_mx_lookup.sh
index 9318d9428..500a6cbc0 100755
--- a/src/gns/test_gns_mx_lookup.sh
+++ b/src/gns/test_gns_mx_lookup.sh
@@ -4,8 +4,13 @@ trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
 then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version
+if test $? != 0
+then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 1
+        exit 77
 fi
 
 rm -fr `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
diff --git a/src/gns/test_gns_nick_shorten.sh b/src/gns/test_gns_nick_shorten.sh
index 63fba1a1c..83fc20713 100755
--- a/src/gns/test_gns_nick_shorten.sh
+++ b/src/gns/test_gns_nick_shorten.sh
@@ -10,8 +10,13 @@ which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
 then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version
+if test $? != 0
+then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 1
+        exit 77
 fi
 
 # Deleting home directory from previous runs
diff --git a/src/gns/test_gns_plus_lookup.sh b/src/gns/test_gns_plus_lookup.sh
index 4ff23c3bc..652838cb8 100755
--- a/src/gns/test_gns_plus_lookup.sh
+++ b/src/gns/test_gns_plus_lookup.sh
@@ -4,8 +4,13 @@ trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
 then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version
+if test $? != 0
+then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 1
+        exit 77
 fi
 
 which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
diff --git a/src/gns/test_gns_quickupdate.sh b/src/gns/test_gns_quickupdate.sh
index 309bc7355..c53eab0f6 100755
--- a/src/gns/test_gns_quickupdate.sh
+++ b/src/gns/test_gns_quickupdate.sh
@@ -4,8 +4,13 @@ trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
 then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version
+if test $? != 0
+then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 1
+        exit 77
 fi
 
 rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
diff --git a/src/gns/test_gns_rel_expiration.sh b/src/gns/test_gns_rel_expiration.sh
index 2db66c4c1..05714aed2 100755
--- a/src/gns/test_gns_rel_expiration.sh
+++ b/src/gns/test_gns_rel_expiration.sh
@@ -4,8 +4,13 @@ trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
 then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version
+if test $? != 0
+then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 1
+        exit 77
 fi
 
 rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
diff --git a/src/gns/test_gns_revocation.sh b/src/gns/test_gns_revocation.sh
index a7287c3dd..21adef664 100755
--- a/src/gns/test_gns_revocation.sh
+++ b/src/gns/test_gns_revocation.sh
@@ -5,8 +5,13 @@ which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
 then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version
+if test $? != 0
+then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 1
+        exit 77
 fi
 
 rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
diff --git a/src/gns/test_gns_soa_lookup.sh b/src/gns/test_gns_soa_lookup.sh
index 272aa7442..54612488f 100755
--- a/src/gns/test_gns_soa_lookup.sh
+++ b/src/gns/test_gns_soa_lookup.sh
@@ -4,8 +4,13 @@ trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
 then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version
+if test $? != 0
+then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 1
+        exit 77
 fi
 
 rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
diff --git a/src/gns/test_gns_txt_lookup.sh b/src/gns/test_gns_txt_lookup.sh
index d527e28c7..f60ba1dbb 100755
--- a/src/gns/test_gns_txt_lookup.sh
+++ b/src/gns/test_gns_txt_lookup.sh
@@ -4,8 +4,13 @@ trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
 then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version
+if test $? != 0
+then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 1
+        exit 77
 fi
 
 rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
diff --git a/src/gns/test_gns_zkey_lookup.sh b/src/gns/test_gns_zkey_lookup.sh
index 36dec131e..9ce5e1d37 100755
--- a/src/gns/test_gns_zkey_lookup.sh
+++ b/src/gns/test_gns_zkey_lookup.sh
@@ -5,8 +5,13 @@ which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
 then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version
+if test $? != 0
+then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 1
+        exit 77
 fi
 
 rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
diff --git a/src/gns/test_gnunet_gns.sh b/src/gns/test_gnunet_gns.sh
index ccec73340..a40debe79 100755
--- a/src/gns/test_gnunet_gns.sh
+++ b/src/gns/test_gnunet_gns.sh
@@ -3,8 +3,13 @@
 LOCATION=$(which gnunet-config)
 if [ -z $LOCATION ]
 then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version
+if test $? != 0
+then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
-        exit 1
+        exit 77
 fi
 
 trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT