diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2020-12-30 20:59:35 +0900 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2020-12-30 20:59:35 +0900 |
commit | cc780f66a4fe096704ab264dce2c6b15b1cf50c5 (patch) | |
tree | a291d7b1246bf6b6bccd3e0c76b32fab058266ff /src/reclaim | |
parent | c0465ff926f1b87a375ff320d367cbbabfddb38f (diff) | |
parent | 1f489833705ee9fc66686ed3045cc5dba56dfd39 (diff) | |
download | gnunet-cc780f66a4fe096704ab264dce2c6b15b1cf50c5.tar.gz gnunet-cc780f66a4fe096704ab264dce2c6b15b1cf50c5.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src/reclaim')
-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 |
3 files changed, 9 insertions, 9 deletions
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..." |