diff options
-rwxr-xr-x | doc/man/produce_html.sh.in | 2 | ||||
-rwxr-xr-x | src/gns/test_gnunet_gns.sh.in | 2 | ||||
-rwxr-xr-x | src/gns/test_proxy.sh | 8 | ||||
-rwxr-xr-x | src/reclaim/test_reclaim_consume.sh | 6 | ||||
-rwxr-xr-x | src/reclaim/test_reclaim_issue.sh | 2 | ||||
-rwxr-xr-x | src/reclaim/test_reclaim_revoke.sh | 10 | ||||
-rwxr-xr-x | src/scalarproduct/test_scalarproduct.sh | 4 | ||||
-rwxr-xr-x | src/scalarproduct/test_scalarproduct_negative.sh | 4 | ||||
-rwxr-xr-x | src/scalarproduct/test_scalarproduct_negativezero.sh | 4 |
9 files changed, 21 insertions, 21 deletions
diff --git a/doc/man/produce_html.sh.in b/doc/man/produce_html.sh.in index d2bd768a8..8680c0106 100755 --- a/doc/man/produce_html.sh.in +++ b/doc/man/produce_html.sh.in | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/bash |
2 | 2 | ||
3 | if test -e @PKGDATADIRECTORY@/existence.sh | 3 | if test -e @PKGDATADIRECTORY@/existence.sh |
4 | then | 4 | then |
diff --git a/src/gns/test_gnunet_gns.sh.in b/src/gns/test_gnunet_gns.sh.in index 8cdd062c7..8a96ff034 100755 --- a/src/gns/test_gnunet_gns.sh.in +++ b/src/gns/test_gnunet_gns.sh.in | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/bash |
2 | # This file is in the public domain. | 2 | # This file is in the public domain. |
3 | # test -z being correct was a false assumption here. | 3 | # test -z being correct was a false assumption here. |
4 | # I have no executable 'fooble', but this will | 4 | # I have no executable 'fooble', but this will |
diff --git a/src/gns/test_proxy.sh b/src/gns/test_proxy.sh index 7c17cd4c5..ee288413f 100755 --- a/src/gns/test_proxy.sh +++ b/src/gns/test_proxy.sh | |||
@@ -31,10 +31,10 @@ cat local.crt > /tmp/server_cacert.pem | |||
31 | cat local.key >> /tmp/server_cacert.pem | 31 | cat local.key >> /tmp/server_cacert.pem |
32 | 32 | ||
33 | gnunet-identity -C test -c test_gns_proxy.conf | 33 | gnunet-identity -C test -c test_gns_proxy.conf |
34 | gnunet-namestore -p -z test -a -n www -t A -V 127.0.0.1 -e never -c test_gns_proxy.conf | 34 | gnunet-namestore -p -z "test" -a -n www -t A -V 127.0.0.1 -e never -c test_gns_proxy.conf |
35 | gnunet-namestore -p -z test -a -n www -t LEHO -V "test.local" -e never -c test_gns_proxy.conf | 35 | gnunet-namestore -p -z "test" -a -n www -t LEHO -V "test.local" -e never -c test_gns_proxy.conf |
36 | gnunet-namestore -p -z test -a -n www -t BOX -V "$OLDBOXVALUE" -e never -c test_gns_proxy.conf | 36 | gnunet-namestore -p -z "test" -a -n www -t BOX -V "$OLDBOXVALUE" -e never -c test_gns_proxy.conf |
37 | gnunet-namestore -p -z test -a -n www -t BOX -V "$BOXVALUE" -e never -c test_gns_proxy.conf | 37 | gnunet-namestore -p -z "test" -a -n www -t BOX -V "$BOXVALUE" -e never -c test_gns_proxy.conf |
38 | 38 | ||
39 | gnunet-arm -i gns-proxy -c test_gns_proxy.conf | 39 | gnunet-arm -i gns-proxy -c test_gns_proxy.conf |
40 | 40 | ||
diff --git a/src/reclaim/test_reclaim_consume.sh b/src/reclaim/test_reclaim_consume.sh index 55f6ff22c..9186d3cb1 100755 --- a/src/reclaim/test_reclaim_consume.sh +++ b/src/reclaim/test_reclaim_consume.sh | |||
@@ -6,7 +6,7 @@ if [ -z $LOCATION ] | |||
6 | then | 6 | then |
7 | LOCATION="gnunet-config" | 7 | LOCATION="gnunet-config" |
8 | fi | 8 | fi |
9 | $LOCATION --version 1> /dev/null | 9 | $LOCATION --version 1>/dev/null |
10 | if test $? != 0 | 10 | if test $? != 0 |
11 | then | 11 | then |
12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | 12 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" |
@@ -20,7 +20,7 @@ rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f` | |||
20 | # (3) PKEY3.user -> PKEY4 | 20 | # (3) PKEY3.user -> PKEY4 |
21 | 21 | ||
22 | 22 | ||
23 | which timeout &> /dev/null && DO_TIMEOUT="timeout 30" | 23 | which timeout >/dev/null 2>&1 && DO_TIMEOUT="timeout 30" |
24 | 24 | ||
25 | TEST_ATTR="test" | 25 | TEST_ATTR="test" |
26 | gnunet-arm -s -c test_reclaim.conf | 26 | gnunet-arm -s -c test_reclaim.conf |
@@ -32,7 +32,7 @@ TEST_KEY=$(gnunet-identity -d -e testego -q -c test_reclaim.conf) | |||
32 | gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf | 32 | gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf |
33 | gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf | 33 | gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf |
34 | TICKET=$(gnunet-reclaim -e testego -i "email,name" -r $SUBJECT_KEY -c test_reclaim.conf | awk '{print $1}') | 34 | TICKET=$(gnunet-reclaim -e testego -i "email,name" -r $SUBJECT_KEY -c test_reclaim.conf | awk '{print $1}') |
35 | gnunet-reclaim -e rpego -C $TICKET -c test_reclaim.conf > /dev/null 2>&1 | 35 | gnunet-reclaim -e rpego -C $TICKET -c test_reclaim.conf >/dev/null 2>&1 |
36 | 36 | ||
37 | if test $? != 0 | 37 | if test $? != 0 |
38 | then | 38 | then |
diff --git a/src/reclaim/test_reclaim_issue.sh b/src/reclaim/test_reclaim_issue.sh index 7ab8a6980..cfddc9407 100755 --- a/src/reclaim/test_reclaim_issue.sh +++ b/src/reclaim/test_reclaim_issue.sh | |||
@@ -20,7 +20,7 @@ rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f` | |||
20 | # (3) PKEY3.user -> PKEY4 | 20 | # (3) PKEY3.user -> PKEY4 |
21 | 21 | ||
22 | 22 | ||
23 | which timeout &> /dev/null && DO_TIMEOUT="timeout 30" | 23 | which timeout >/dev/null 2>&1 && DO_TIMEOUT="timeout 30" |
24 | 24 | ||
25 | TEST_ATTR="test" | 25 | TEST_ATTR="test" |
26 | gnunet-arm -s -c test_reclaim.conf | 26 | gnunet-arm -s -c test_reclaim.conf |
diff --git a/src/reclaim/test_reclaim_revoke.sh b/src/reclaim/test_reclaim_revoke.sh index ffbc7ef2b..da091a1ee 100755 --- a/src/reclaim/test_reclaim_revoke.sh +++ b/src/reclaim/test_reclaim_revoke.sh | |||
@@ -20,10 +20,10 @@ rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f` | |||
20 | # (3) PKEY3.user -> PKEY4 | 20 | # (3) PKEY3.user -> PKEY4 |
21 | 21 | ||
22 | 22 | ||
23 | which timeout &> /dev/null && DO_TIMEOUT="timeout 30" | 23 | which timeout >/dev/null 2&>1 && DO_TIMEOUT="timeout 30" |
24 | 24 | ||
25 | TEST_ATTR="test" | 25 | TEST_ATTR="test" |
26 | gnunet-arm -s -c test_reclaim.conf 2&>1 > /dev/null | 26 | gnunet-arm -s -c test_reclaim.conf >/dev/null 2&>1 |
27 | gnunet-identity -C alice -c test_reclaim.conf | 27 | gnunet-identity -C alice -c test_reclaim.conf |
28 | gnunet-identity -C bob -c test_reclaim.conf | 28 | gnunet-identity -C bob -c test_reclaim.conf |
29 | gnunet-identity -C eve -c test_reclaim.conf | 29 | gnunet-identity -C eve -c test_reclaim.conf |
@@ -43,7 +43,7 @@ sleep 16 | |||
43 | echo "Consuming $TICKET" | 43 | echo "Consuming $TICKET" |
44 | 44 | ||
45 | gnunet-reclaim -e eve -C $TICKET_EVE -c test_reclaim.conf | 45 | gnunet-reclaim -e eve -C $TICKET_EVE -c test_reclaim.conf |
46 | if test $? == 0 | 46 | if test $? = 0 |
47 | then | 47 | then |
48 | echo "Eve can still resolve attributes..." | 48 | echo "Eve can still resolve attributes..." |
49 | gnunet-arm -e -c test_reclaim.conf | 49 | gnunet-arm -e -c test_reclaim.conf |
@@ -51,10 +51,10 @@ then | |||
51 | fi | 51 | fi |
52 | 52 | ||
53 | gnunet-arm -e -c test_reclaim.conf | 53 | gnunet-arm -e -c test_reclaim.conf |
54 | gnunet-arm -s -c test_reclaim.conf 2&>1 > /dev/null | 54 | gnunet-arm -s -c test_reclaim.conf >/dev/null 2&>1 |
55 | 55 | ||
56 | gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf | 56 | gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf |
57 | #gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf 2&>1 >/dev/null | 57 | #gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf >/dev/null 2&>1 |
58 | if test $? != 0 | 58 | if test $? != 0 |
59 | then | 59 | then |
60 | echo "Bob cannot resolve attributes..." | 60 | echo "Bob cannot resolve attributes..." |
diff --git a/src/scalarproduct/test_scalarproduct.sh b/src/scalarproduct/test_scalarproduct.sh index c0401beb7..ed91cd5c4 100755 --- a/src/scalarproduct/test_scalarproduct.sh +++ b/src/scalarproduct/test_scalarproduct.sh | |||
@@ -25,7 +25,7 @@ echo "Waiting for peers to start..." | |||
25 | sleep 5 | 25 | sleep 5 |
26 | echo "Running test..." | 26 | echo "Running test..." |
27 | 27 | ||
28 | which timeout &> /dev/null && DO_TIMEOUT="timeout 15" | 28 | which timeout >/dev/null 2>&1 && DO_TIMEOUT="timeout 15" |
29 | 29 | ||
30 | # get bob's peer ID, necessary for alice | 30 | # get bob's peer ID, necessary for alice |
31 | PEERIDBOB=`${DO_TIMEOUT} gnunet-peerinfo -qs $CFGBOB` | 31 | PEERIDBOB=`${DO_TIMEOUT} gnunet-peerinfo -qs $CFGBOB` |
@@ -38,7 +38,7 @@ RESULT=`${DO_TIMEOUT} gnunet-scalarproduct $CFGALICE $INPUTALICE -p $PEERIDBOB` | |||
38 | # terminate the testbed | 38 | # terminate the testbed |
39 | kill $PID | 39 | kill $PID |
40 | 40 | ||
41 | if [ "$RESULT" == "$EXPECTED" ] | 41 | if [ "$RESULT" = "$EXPECTED" ] |
42 | then | 42 | then |
43 | echo "OK" | 43 | echo "OK" |
44 | exit 0 | 44 | exit 0 |
diff --git a/src/scalarproduct/test_scalarproduct_negative.sh b/src/scalarproduct/test_scalarproduct_negative.sh index cbeb1b9fd..b08e4527f 100755 --- a/src/scalarproduct/test_scalarproduct_negative.sh +++ b/src/scalarproduct/test_scalarproduct_negative.sh | |||
@@ -11,7 +11,7 @@ PREFIX=/tmp/test-scalarproduct`date +%H%M%S` | |||
11 | CFGALICE="-c $PREFIX/0/config" | 11 | CFGALICE="-c $PREFIX/0/config" |
12 | CFGBOB="-c $PREFIX/1/config" | 12 | CFGBOB="-c $PREFIX/1/config" |
13 | 13 | ||
14 | which timeout &> /dev/null && DO_TIMEOUT="timeout 15" | 14 | which timeout >/dev/null 2>&1 && DO_TIMEOUT="timeout 15" |
15 | 15 | ||
16 | # launch two peers in line topology non-interactively | 16 | # launch two peers in line topology non-interactively |
17 | # | 17 | # |
@@ -36,7 +36,7 @@ RESULT=`${DO_TIMEOUT} gnunet-scalarproduct $CFGALICE $INPUTALICE -p $PEERIDBOB` | |||
36 | kill $PID | 36 | kill $PID |
37 | 37 | ||
38 | EXPECTED="-0CCC" | 38 | EXPECTED="-0CCC" |
39 | if [ "$RESULT" == "$EXPECTED" ] | 39 | if [ "$RESULT" = "$EXPECTED" ] |
40 | then | 40 | then |
41 | echo "OK" | 41 | echo "OK" |
42 | exit 0 | 42 | exit 0 |
diff --git a/src/scalarproduct/test_scalarproduct_negativezero.sh b/src/scalarproduct/test_scalarproduct_negativezero.sh index 1ab7157af..6f80b2ea2 100755 --- a/src/scalarproduct/test_scalarproduct_negativezero.sh +++ b/src/scalarproduct/test_scalarproduct_negativezero.sh | |||
@@ -22,7 +22,7 @@ PID=$! | |||
22 | # sleep 1 is too short on most systems, 2 works on most, 5 seems to be safe | 22 | # sleep 1 is too short on most systems, 2 works on most, 5 seems to be safe |
23 | sleep 5 | 23 | sleep 5 |
24 | 24 | ||
25 | which timeout &> /dev/null && DO_TIMEOUT="timeout 15" | 25 | which timeout >/dev/null 2>&1 && DO_TIMEOUT="timeout 15" |
26 | 26 | ||
27 | # get bob's peer ID, necessary for alice | 27 | # get bob's peer ID, necessary for alice |
28 | PEERIDBOB=`${DO_TIMEOUT} gnunet-peerinfo -qs $CFGBOB` | 28 | PEERIDBOB=`${DO_TIMEOUT} gnunet-peerinfo -qs $CFGBOB` |
@@ -36,7 +36,7 @@ RESULT=`${DO_TIMEOUT} gnunet-scalarproduct $CFGALICE $INPUTALICE -p $PEERIDBOB` | |||
36 | kill $PID | 36 | kill $PID |
37 | 37 | ||
38 | EXPECTED="00" | 38 | EXPECTED="00" |
39 | if [ "$RESULT" == "$EXPECTED" ] | 39 | if [ "$RESULT" = "$EXPECTED" ] |
40 | then | 40 | then |
41 | echo "OK" | 41 | echo "OK" |
42 | exit 0 | 42 | exit 0 |