From bd18c891fc1abb78c113615b154f3c18e32e855f Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Tue, 31 May 2011 19:53:25 +0200 Subject: [PATCH] Fixed race condition in test --- testsuite/tests-to-run/test60.sh | 5 ++++- testsuite/wanted-results/test60 | 30 +++++++++++++++++++++++++----- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/testsuite/tests-to-run/test60.sh b/testsuite/tests-to-run/test60.sh index d704798f..31fdd1c9 100644 --- a/testsuite/tests-to-run/test60.sh +++ b/testsuite/tests-to-run/test60.sh @@ -5,7 +5,10 @@ SERVER2=parallel-server2 echo '### Test --onall' parallel --onall -S parallel@$SERVER2,$SERVER1 '(echo {3} {2}) | awk \{print\ \$2}' ::: a b c ::: 1 2 3 -parallel --onall -S parallel@$SERVER2,$SERVER1 -u '(echo {3} {2}) | awk \{print\ \$2}' ::: a b c ::: 1 2 3 +echo '### Test | --onall' +seq 3 | parallel --onall -S parallel@$SERVER2,$SERVER1 '(echo {3} {2}) | awk \{print\ \$2}' ::: a b c :::: - +echo '### Test --onall -u' +parallel --onall -S parallel@$SERVER2,$SERVER1 -u '(echo {3} {2}) | awk \{print\ \$2}' ::: a b c ::: 1 2 3 | sort echo '### Test --nonall' parallel --nonall -S parallel@$SERVER2,$SERVER1 'hostname' diff --git a/testsuite/wanted-results/test60 b/testsuite/wanted-results/test60 index 92dca977..f919b468 100644 --- a/testsuite/wanted-results/test60 +++ b/testsuite/wanted-results/test60 @@ -17,23 +17,43 @@ 1 2 3 -1 +### Test | --onall 1 2 3 -2 1 -3 2 3 1 +2 +3 1 2 +3 +1 +2 +3 +1 +2 +3 +### Test --onall -u +1 +1 +1 +1 +1 +1 +2 +2 +2 +2 +2 2 3 3 -1 -2 +3 +3 +3 3 ### Test --nonall nlv.pi.dk