Changeset 100 for trunk/test

Timestamp:

Mar 27, 2007, 11:55:19 PM (18 years ago)

Author:

rainer

Message:

Release 2.3.3; minor testscript and typo fixes.

Location:

trunk/test

Files:

• testrun_1a.sh (modified) (2 diffs)
• testrun_1b.sh (modified) (2 diffs)
• testrun_2c.sh (modified) (4 diffs)

trunk/test/testrun_1a.sh

@@ -135 +135 @@
         [ -z "$quiet" ] && log_ok ${tcount} ${MAXTEST};
     fi
+    return 0
 }
 
@@ -148 +149 @@
     BUILDOPTS="$PREBUILDOPTS --enable-stealth=137"; export BUILDOPTS
     testrun_stealth
-
+    check_err $? ${tcount};
     log_end "RUN STANDALONE W/STEALTH"
     return 0

trunk/test/testrun_1b.sh

@@ -203 +203 @@
         log_skip 1 $MAXTEST 'gpg not found in $PATH'
         log_skip 2 $MAXTEST 'gpg not found in $PATH'
+        log_skip 3 $MAXTEST 'gpg not found in $PATH'
     else
         eval "$GPG" --list-keys 0F571F6C >/dev/null 2>/dev/null
@@ -208 +209 @@
             log_skip 1 $MAXTEST 'public PGP key 0x0F571F6C not present'
             log_skip 2 $MAXTEST 'public PGP key 0x0F571F6C not present'
+            log_skip 3 $MAXTEST 'public PGP key 0x0F571F6C not present'
         else
             #

trunk/test/testrun_2c.sh

@@ -123 +123 @@
     if [ -z "$doall" ]; then
         log_skip 1 $MAXTEST 'Client/server w/mysql (or use --really-all)'
+        log_skip 2 $MAXTEST 'Client/server w/mysql (or use --really-all)'
+        log_skip 3 $MAXTEST 'Client/server w/mysql (or use --really-all)'
         return 0
     fi
@@ -131 +133 @@
     if [ -z "$MYSQL" ]; then
         log_skip 1 $MAXTEST "mysql not found";
+        log_skip 2 $MAXTEST "mysql not found";
+        log_skip 3 $MAXTEST "mysql not found";
         return 1
     else
@@ -136 +140 @@
         if [ $? -ne 0 -o -z "$TEST" ]; then
             log_skip 1 $MAXTEST "mysql not default setup"
+            log_skip 2 $MAXTEST "mysql not default setup"
+            log_skip 3 $MAXTEST "mysql not default setup"
             return 1
         fi
@@ -189 +195 @@
     GPG=`find_path gpg`
     if [ -z "$GPG" ]; then
-        log_skip 1 $MAXTEST 'gpg not found in $PATH'
+        log_skip 3 $MAXTEST 'gpg not found in $PATH'
     else
         eval "$GPG" --list-keys 0F571F6C >/dev/null 2>/dev/null
         if [ $? -ne 0 ]; then
-            log_skip 1 $MAXTEST 'public PGP key 0x0F571F6C not present'
+            log_skip 3 $MAXTEST 'public PGP key 0x0F571F6C not present'
         else
             testrun_threesockets "$GPG"