[rt46602] Prefix R:<result> as R:<test>:<result>

Resolve conflict in run.sh during cherry-pick from experimental branch.

(cherry picked from commit 278c72fef67c5c65a897fe2e5d87db38738594f6)
(cherry picked from commit b8e866d60fab39a0909735cc01fa10fa23fe789b)
(cherry picked from commit ff56ecafc4aa1a0fbf94da65748ac97691d25ace)

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 3c8cb0e35e6ab8858fad22c9806bf0d40da5c816..2306810c35e4c2c2c2d9e49f77e74d4436ced4d2 100644 (file)
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -66,7 +66,7 @@ echoinfo "A:System test $test" >&2
 if [ x${PERL:+set} = x ]
 then
     echowarn "I:Perl not available.  Skipping test." >&2
-    echowarn "R:UNTESTED" >&2
+    echowarn "R:$test:UNTESTED" >&2
     echoinfo "E:$test:`date $dateargs`" >&2
     exit 0;
 fi
@@ -79,7 +79,7 @@ if [ $result -eq 0 ]; then
     : prereqs ok
 else
     echowarn "I:Prerequisites for $test missing, skipping test." >&2
-    [ $result -eq 255 ] && echowarn "R:SKIPPED" || echowarn "R:UNTESTED"
+    [ $result -eq 255 ] && echowarn "R:$test:SKIPPED" || echowarn "R:$test:UNTESTED"
     echoinfo "E:$test:`date $dateargs`" >&2
     exit 0
 fi
@@ -87,7 +87,7 @@ fi
 # Test sockets after the prerequisites has been setup
 $PERL testsock.pl -p "${port}" || {
     echowarn "I:Network interface aliases not set up.  Skipping test." >&2;
-    echowarn "R:UNTESTED" >&2;
+    echowarn "R:$test:UNTESTED" >&2;
     echoinfo "E:$test:`date $dateargs`" >&2;
     exit 0;
 }
@@ -99,7 +99,7 @@ then
     : pkcs11 ok
 else
     echowarn "I:Need PKCS#11 for $test, skipping test." >&2
-    echowarn "R:PKCS11ONLY" >&2
+    echowarn "R:$test:PKCS11ONLY" >&2
     echoinfo "E:$test:`date $dateargs`" >&2
     exit 0
 fi
@@ -111,7 +111,7 @@ then
 fi
 
 # Start name servers running
-$PERL start.pl -p $port $test || { echofail "R:FAIL"; echoinfo "E:$test:`date $dateargs`"; exit 1; }
+$PERL start.pl -p $port $test || { echofail "R:$test:$FAIL"; echoinfo "E:$test:`date $dateargs`"; exit 1; }
 
 # Run the tests
 ( cd $test ; $SHELL tests.sh -c "$controlport" -p "$port" "$@" )
@@ -131,12 +131,11 @@ $PERL stop.pl $test
 status=`expr $status + $?`
 
 if [ $status != 0 ]; then
-    echofail "R:FAIL"
-    # Don't clean up - we need the evidence.
-    find . -name core -exec chmod 0644 '{}' \;
+       echofail "R:$test:$FAIL"
+       # Don't clean up - we need the evidence.
+       find . -name core -exec chmod 0644 '{}' \;
 else
-    echopass "R:PASS"
-
+       echopass "R:$test:PASS"
     if $clean
     then
         rm -f $SYSTEMTESTTOP/random.data

diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh
index 4cba8c56b47849ff6364d71d06a958350586da3b..c746f0ce470ec138b94153b9402df6f6049173dc 100644 (file)
--- a/bin/tests/system/runall.sh
+++ b/bin/tests/system/runall.sh
@@ -42,7 +42,7 @@ EOF
 }
 
 echo "I:System test result summary:"
-grep '^R:' systests.output | sort | uniq -c | sed -e 's/^/I: /' -e 's/R://'
-grep '^R:FAIL' systests.output > /dev/null && status=1
+grep '^R:' systests.output | sed -e 's/^/I: /' -e 's/R:[^:]*//' | sort | uniq -c
+grep '^R:[^:]*:FAIL' systests.output > /dev/null && status=1
 
 exit $status