Changeset 20 for trunk/test

Timestamp:

Feb 13, 2006, 11:54:42 PM (19 years ago)

Author:

rainer

Message:

Enable command-line parsing for prelude, and make prelude regression test safer.

File:

• trunk/test/testrun_1b.sh (modified) (2 diffs)

trunk/test/testrun_1b.sh

@@ -102 +102 @@
     rm -f $PW_DIR/test_log_prelude
 
-    ( "$PM" --textmod -l $PW_DIR/test_log_prelude >/dev/null 2>&1 )&
+    "$PM" --textmod -l $PW_DIR/test_log_prelude --listen 127.0.0.1:5500 >/dev/null 2>&1 &
     PID=$!
 
-    ./samhain -t check -p none -l info --set-prelude-severity=info >/dev/null
+    sleep 5
+
+    ./samhain -t check -p none -l info --set-prelude-severity=info --prelude --server-addr 127.0.0.1:5500 >/dev/null
     
     if test x$? = x0; then
@@ -166 +168 @@
             else
                 BUILDOPTS="--quiet $TRUST --enable-debug --with-prelude --with-gpg=${GPG} --with-checksum=no --enable-micro-stealth=137 --enable-login-watch --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE  --with-log-file=$PW_DIR/.samhain_log --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file"
-                testrun1b_internal "${BUILDOPTS}"
+                testrun1b_internal "${BUILDOPTS} CFLAGS=-DSH_NOFAILOVER=1"
                 do_test_1b_2
                 if [ $? -eq 0 ]; then