[rt46602] Remove option to format the printed start time of a test

There was too much incompatibility between operating systems as to
the allowed options for "date".

(cherry picked from commit 451b7309caf16ff907f1d87b59716f612e396251)
(cherry picked from commit 8376949ea88db0bed60fafc0d769bd3aeff55664)

diff --git a/bin/tests/system/README b/bin/tests/system/README
index ba844e4cd3755e0e491f99a7222dd00a7fa21d5c..3cd9df6003ade675b5fcc30184c8c0654eeb1996 100644 (file)
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -77,18 +77,6 @@ e.g.
 
 Optional flags are:
 
-    -p <number>     Sets the range of ports used by the test.  A block of 100
-                    ports is available for each test, the number given to the
-                    "-p" switch being the number of the start of that block
-                    (e.g.  "-p 7900" will mean that the test is able to use
-                    ports 7900 through 7999).  If not specified, the test will
-                    have ports 5000 to 5099 available to it.
-
-    -n              Noclean - do not remove the output files if the test
-                    completes successfully.  By default, files created by the
-                    test are deleted if it passes;  they are not deleted if the
-                    test fails.
-
     -k              Keep servers running after the test completes.  Each test
                     usually starts a number of nameservers, either instances
                     of the "named" being tested, or custom servers (written in
@@ -99,15 +87,17 @@ Optional flags are:
                     sent by hand.  To stop the servers afterwards, use the
                     command "sh stop.sh <test-name>".
 
-    -d <arg>        Arguments to the "date" command used to produce the
-                    start and end time of the tests.  For example, the
-                    switch
-
-                        -d "+%Y-%m-%d:%H:%M:%S"
+    -n              Noclean - do not remove the output files if the test
+                    completes successfully.  By default, files created by the
+                    test are deleted if it passes;  they are not deleted if the
+                    test fails.
 
-                    would cause the "S" and "E" messages (see below) to have
-                    the date looking like "2017-11-23:16:06:32" instead of the
-                    default "Thu, 23 Nov 2017 16:06:32 +0000".
+    -p <number>     Sets the range of ports used by the test.  A block of 100
+                    ports is available for each test, the number given to the
+                    "-p" switch being the number of the start of that block
+                    (e.g.  "-p 7900" will mean that the test is able to use
+                    ports 7900 through 7999).  If not specified, the test will
+                    have ports 5000 to 5099 available to it.
 
     -r              The "runall" flag.  This is related to cleaning up after
                     the tests (see "Maintenance Notes" below).  If specified,

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 68c2907192ba5c51ca87bcb8ba20ca28c7e394e6..948eb0cd8198581f41625476f11b9e97ce1acb70 100644 (file)
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -25,14 +25,12 @@ SYSTEMTESTTOP=.
 stopservers=true
 clean=true
 baseport=5300
-dateargs="-R"
 
 while getopts "rnp:d:" flag; do
     case "$flag" in
        k) stopservers=false ;;
        n) clean=false ;;
        p) baseport=$OPTARG ;;
-       d) dateargs=$OPTARG ;;
        r) runall="-r" ;;
        *) exit 1 ;;
     esac
@@ -94,7 +92,7 @@ export LOWPORT=$baseport
 export HIGHPORT=`expr $baseport + $numport - 1`
 
 
-echostart "S:$systest:`date $dateargs`"
+echostart "S:$systest:`date`"
 echoinfo  "T:$systest:1:A"
 echoinfo  "A:$systest:System test $systest"
 echoinfo  "I:$systest:PORTRANGE:${LOWPORT} - ${HIGHPORT}"