Changeset 68 for trunk/test/test.sh

Timestamp:

Oct 30, 2006, 12:03:44 AM (18 years ago)

Author:

rainer

Message:

Update trunk to samhain 2.3

File:

• trunk/test/test.sh (modified) (13 diffs)

trunk/test/test.sh

@@ -138 +138 @@
 usage() {
     echo "test.sh [options] <test_number> [hostname]"
-    echo "        [-q|--quiet|-v|--verbose] [-s|--stoponerr] [--no-cleanup]"
+    echo "        [-q|--quiet|-v|--verbose] [-s|--stoponerr] [-n|--no-cleanup]"
     echo "        [--srcdir=top_srcdir] [--color=always|never|auto]"
     echo
@@ -149 +149 @@
     echo "  ${S}test.sh  7${E}  -- GnuPG signed files / prelude log"
     echo "  ${S}test.sh  8${E}  -- Suidcheck"
-
-    echo "  ${S}test.sh 10${E}  -- Test c/s init/check      (testrc_2.in)"
-    echo "  ${S}test.sh 11${E}  -- Test full c/s init/check (testrc_2.in)"
-    echo "  ${S}test.sh 12${E}  -- Test full c/s w/gpg      (testrc_2.in)"
-    echo "  ${S}test.sh 13${E}  -- Test full c/s w/mysql    (testrc_2.in)"
-    echo "  ${S}test.sh 14${E}  -- Test full c/s w/postgres (testrc_2.in)"
+    echo "  ${S}test.sh  9${E}  -- Process check"
+    echo "  ${S}test.sh 10${E}  -- Port check"
+
+    echo "  ${S}test.sh 20${E}  -- Test c/s init/check      (testrc_2.in)"
+    echo "  ${S}test.sh 21${E}  -- Test full c/s init/check (testrc_2.in)"
+    echo "  ${S}test.sh 22${E}  -- Test full c/s w/gpg      (testrc_2.in)"
+    echo "  ${S}test.sh 23${E}  -- Test full c/s w/mysql    (testrc_2.in)"
+    echo "  ${S}test.sh 24${E}  -- Test full c/s w/postgres (testrc_2.in)"
     echo "  ${S}test.sh all${E} -- All tests"
 }
@@ -162 +164 @@
     echo "  (1) testcompile.sh (2) testhash.sh     (3) testrun_1.sh   (4) testrun_1a.sh"
     echo "  (5) testext.sh     (6) testtimesrv.sh  (7) testrun_1b.sh  (8) testrun_1c.sh" 
-    echo " (10) testrun_2.sh  (11) testrun_2a.sh  (12) testrun_2b.sh (13) testrun_2c.sh"
-    echo " (14) testrun_2d.sh"
+    echo "  (9) testrun_1d.sh" 
+    echo " (20) testrun_2.sh  (21) testrun_2a.sh  (22) testrun_2b.sh (23) testrun_2c.sh"
+    echo " (24) testrun_2d.sh"
 }
 
@@ -185 +188 @@
         -q|--quiet)    quiet=on; verbose= ;;
         -s|--stoponerr)     stoponerr=on;;
-        --no-cleanup) cleanup= ;;
+        -n|--no-cleanup) cleanup= ;;
         --really-all) doall=on;;
         --valgrind) usevalgrind=on;;
@@ -366 +369 @@
 
 log_fail () { 
-    log_msg "$1" "$2" failure "$3"; 
+    [ -z "$quiet" ] && log_msg "$1" "$2" failure "$3"; 
     let "failcount = failcount + 1" >/dev/null; 
     test -z "$stoponerr" || exit 1; 
 }
 log_ok ()   { 
-    log_msg "$1" "$2" success "$3"; 
+    [ -z "$quiet" ] && log_msg "$1" "$2" success "$3"; 
     let "okcount = okcount + 1" >/dev/null; 
 }
 log_skip () { 
-    log_msg "$1" "$2" skipped "$3"; 
+    [ -z "$quiet" ] && log_msg "$1" "$2" skipped "$3"; 
     let "skipcount = skipcount + 1" >/dev/null; 
 }
@@ -441 +444 @@
 print_summary ()
 {
-    let "gcount = okcount + skipcount + failcount" >/dev/null;
+    # let "gcount = okcount + skipcount + failcount" >/dev/null;
+    gcount=$MAXTEST;
+    let "failcount = gcount - okcount - skipcount" >/dev/null;
+
     [ -z "$quiet" ] && { 
         echo
@@ -594 +600 @@
     exit $?
 fi
+if test x$1 = x9; then
+    . ${SCRIPTDIR}/testrun_1.sh
+    . ${SCRIPTDIR}/testrun_1d.sh
+    testrun1d
+    print_summary
+    exit $?
+fi
 if test x$1 = x10; then
+    . ${SCRIPTDIR}/testrun_1.sh
+    . ${SCRIPTDIR}/testrun_1e.sh
+    testrun1e
+    print_summary
+    exit $?
+fi
+if test x$1 = x20; then
     . ${SCRIPTDIR}/testrun_2.sh 
     testrun2 $hostname
@@ -600 +620 @@
     exit $?
 fi
-if test x$1 = x11; then
+if test x$1 = x21; then
     . ${SCRIPTDIR}/testrun_2a.sh
     testrun2a $hostname
@@ -606 +626 @@
     exit $?
 fi
-if test x$1 = x12; then
+if test x$1 = x22; then
     . ${SCRIPTDIR}/testrun_2a.sh
     . ${SCRIPTDIR}/testrun_2b.sh
@@ -613 +633 @@
     exit $?
 fi
-if test x$1 = x13; then
+if test x$1 = x23; then
     . ${SCRIPTDIR}/testrun_2a.sh
     . ${SCRIPTDIR}/testrun_2c.sh 
@@ -620 +640 @@
     exit $?
 fi
-if test x$1 = x14; then
+if test x$1 = x24; then
     . ${SCRIPTDIR}/testrun_2a.sh
     . ${SCRIPTDIR}/testrun_2d.sh
@@ -644 +664 @@
     let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null
     . ${SCRIPTDIR}/testrun_1c.sh
+    let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null
+    . ${SCRIPTDIR}/testrun_1d.sh
+    let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null
+    . ${SCRIPTDIR}/testrun_1e.sh
     let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null
     . ${SCRIPTDIR}/testrun_2.sh
@@ -687 +711 @@
     MAXTEST=${TEST_MAX}; export MAXTEST
     testrun1c
+    #
+    . ${SCRIPTDIR}/testrun_1.sh
+    . ${SCRIPTDIR}/testrun_1d.sh
+    MAXTEST=${TEST_MAX}; export MAXTEST
+    testrun1d
+    #
+    . ${SCRIPTDIR}/testrun_1.sh
+    . ${SCRIPTDIR}/testrun_1e.sh
+    MAXTEST=${TEST_MAX}; export MAXTEST
+    testrun1e
     #
     . ${SCRIPTDIR}/testrun_2.sh