[master] capture stderr in systests.output

- also tidied up runall.sh summary output

diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh
index f39f7a7331ac3f4678238e7f1b63117d982a3542..5881656cc7922c81bbfff9e4c4acb027cb9d8fde 100644 (file)
--- a/bin/tests/system/runall.sh
+++ b/bin/tests/system/runall.sh
@@ -15,8 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: runall.sh,v 1.13 2011/12/19 23:08:50 marka Exp $
-
 #
 # Run all the system tests.
 #
@@ -31,22 +29,20 @@ status=0
     do
             sh run.sh $d || status=1
     done
+} 2>&1 | tee "systests.output"
 
-    $PERL testsock.pl || {
-        cat <<EOF >&2
+$PERL testsock.pl || {
+    cat <<EOF >&2
 I:
-I:NOTE: Many of the tests were skipped because they require that
-I:      the IP addresses 10.53.0.1 through 10.53.0.7 are configured 
-I:     as alias addresses on the loopback interface.  Please run
-I:     "bin/tests/system/ifconfig.sh up" as root to configure them
-I:     and rerun the tests.
+I:NOTE: System tests were skipped because they require that the
+I:      IP addresses 10.53.0.1 through 10.53.0.8 be configured
+I:      as alias addresses on the loopback interface.  Please run
+I:      "bin/tests/system/ifconfig.sh up" as root to configure them.
 EOF
-        exit 0;
-    }
-} | tee "systests.output"
+}
 
 echo "I:System test result summary:"
-grep '^R:' systests.output | sort | uniq -c | sed -e 's/^/I:   /' -e 's/R://'
+grep '^R:' systests.output | sort | uniq -c | sed -e 's/^/I: /' -e 's/R://'
 grep '^R:FAIL' systests.output > /dev/null && status=1
 
 exit $status