Index: trunk/test/test.sh =================================================================== --- trunk/test/test.sh (revision 169) +++ trunk/test/test.sh (revision 170) @@ -296,5 +296,5 @@ MAKE=`which gmake` if test "x$?" = x1 ; then - MAKE="make -s" + MAKE="make -s -j 3" else MAKE=`which gmake | sed -e "s%\([a-z:]\) .*%\1%g"` Index: trunk/test/testcompile.sh =================================================================== --- trunk/test/testcompile.sh (revision 169) +++ trunk/test/testcompile.sh (revision 170) @@ -41,4 +41,9 @@ if [ -z "$doall" ]; then [ -z "$quiet" ] && log_skip $2 ${MAXTEST} "$TEST (smatch)"; + return 0 + fi + + if [ ! -f "./x_samhain.c.sm" ]; then + [ -z "$quiet" ] && log_skip $2 ${MAXTEST} "$TEST (skip smatch)"; return 0 fi @@ -140,5 +145,7 @@ SAVE_CC="${CC}" SMATCH="DBGDEF=--smatch"; export SMATCH + SAVE_SMATCH="${SMATCH}"; export SAVE_SMATCH CC="/usr/local/gcc-smatch/bin/gcc"; export CC + SMATCH_CC="${CC}" fi @@ -187,4 +194,6 @@ fi # + [ -z "${SMATCH}" ] || { CC="${SAVE_CC}"; export CC; SMATCH=""; export SMATCH; } + # ${TOP_SRCDIR}/configure --quiet --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test --enable-static --enable-suidcheck --enable-process-check > /dev/null 2>> test_log # @@ -193,5 +202,6 @@ let "num = num + 1" >/dev/null run_smatch $? $num || let "numfail = numfail + 1" >/dev/null - + # + [ -z "${SMATCH_CC}" ] || { CC="${SMATCH_CC}"; export CC; SMATCH="${SAVE_SMATCH}"; export SMATCH; } # # test standalone compilation @@ -481,4 +491,6 @@ fi # + [ -z "${SMATCH}" ] || { CC="${SAVE_CC}"; export CC; SMATCH=""; export SMATCH; } + # ${TOP_SRCDIR}/configure --quiet --enable-network=client --enable-static --enable-srp --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test --with-timeserver=127.0.0.1 > /dev/null 2>> test_log # @@ -498,5 +510,6 @@ let "num = num + 1" >/dev/null run_smatch $? $num || let "numfail = numfail + 1" >/dev/null - + # + [ -z "${SMATCH_CC}" ] || { CC="${SMATCH_CC}"; export CC; SMATCH="${SAVE_SMATCH}"; export SMATCH; } # # test c/s compilation w/ gpg Index: trunk/test/testrun_1b.sh =================================================================== --- trunk/test/testrun_1b.sh (revision 169) +++ trunk/test/testrun_1b.sh (revision 170) @@ -20,7 +20,20 @@ # -MAXTEST=6; export MAXTEST +MAXTEST=7; export MAXTEST LOGFILE="$PW_DIR/.samhain_log"; export LOGFILE RCFILE="$PW_DIR/testrc_1.dyn"; export RCFILE + +testrun1b_modrc () +{ + ORIGINAL="\[EOF\]" + REPLACEMENT="\[PortCheck\]" + ex -s $RCFILE <>"$RCFILE" + echo "PortCheckInterface = 127.0.0.1" >>"$RCFILE" +} testrun1b_internal () @@ -173,4 +186,9 @@ cp "${SCRIPTDIR}/testrc_1" "${RCFILE}" + + if test "x$2" = "xmodrc"; then + [ -z "$verbose" ] || log_msg_ok "mod rc..."; + testrun1b_modrc + fi ./samhain -t init -p none -l info @@ -253,7 +271,14 @@ [ -z "$verbose" ] || log_msg_fail "checking"; fi - tmp=`egrep 'Classification text: Checking' test_log_prelude 2>/dev/null | wc -l` - if [ $tmp -lt 1 ]; then - [ -z "$verbose" ] || log_msg_fail "checking"; + # + if test "x$2" = "xmodrc"; then + tmp=`egrep 'Classification text: Service opened' test_log_prelude 2>/dev/null | wc -l` + if [ $tmp -lt 1 ]; then + [ -z "$verbose" ] || log_msg_fail "service"; + fi + tmp=`egrep 'Service: port=5500' test_log_prelude 2>/dev/null | wc -l` + if [ $tmp -lt 1 ]; then + [ -z "$verbose" ] || log_msg_fail "port 5500"; + fi fi # @@ -270,4 +295,8 @@ log_skip 2 $MAXTEST 'gpg not found in $PATH' log_skip 3 $MAXTEST 'gpg not found in $PATH' + log_skip 4 $MAXTEST 'gpg not found in $PATH' + log_skip 5 $MAXTEST 'gpg not found in $PATH' + log_skip 6 $MAXTEST 'gpg not found in $PATH' + log_skip 7 $MAXTEST 'gpg not found in $PATH' else eval "$GPG" --list-keys 0F571F6C >/dev/null 2>/dev/null @@ -278,4 +307,6 @@ log_skip 4 $MAXTEST 'public PGP key 0x0F571F6C not present' log_skip 5 $MAXTEST 'public PGP key 0x0F571F6C not present' + log_skip 6 $MAXTEST 'public PGP key 0x0F571F6C not present' + log_skip 7 $MAXTEST 'public PGP key 0x0F571F6C not present' else # @@ -342,8 +373,10 @@ # ------------- fifth test ------------- # - if test -f /usr/local/lib/libprelude.so + if ! test -d /var/run/prelude-manager then - LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" - export LD_LIBRARY_PATH + [ -z "$verbose" ] || log_msg_ok "create /var/run/prelude-manager..."; + sudo mkdir /var/run/prelude-manager + sudo chown prelude:rainer /var/run/prelude-manager + sudo chmod 770 /var/run/prelude-manager fi # @@ -367,8 +400,10 @@ # ------------- sixth test ------------- # - if test -f /usr/local/lib/libprelude.so + if ! test -d /var/run/prelude-manager then - LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" - export LD_LIBRARY_PATH + [ -z "$verbose" ] || log_msg_ok "create /var/run/prelude-manager..."; + sudo mkdir /var/run/prelude-manager + sudo chown prelude:rainer /var/run/prelude-manager + sudo chmod 770 /var/run/prelude-manager fi # @@ -389,4 +424,31 @@ fi + # + # ------------- seventh test ----------- + # + if ! test -d /var/run/prelude-manager + then + [ -z "$verbose" ] || log_msg_ok "create /var/run/prelude-manager..."; + sudo mkdir /var/run/prelude-manager + sudo chown prelude:rainer /var/run/prelude-manager + sudo chmod 770 /var/run/prelude-manager + fi + # + PM=`find_path prelude-manager` + if [ -z "$PM" ]; then + log_skip 7 $MAXTEST 'prelude-manager not found in $PATH' + elif [ -z "$doall" ]; then + log_skip 7 $MAXTEST 'logging to prelude (or use --really-all)' + else + BUILDOPTS="--quiet $TRUST --with-prelude --enable-login-watch --enable-mounts-check --enable-process-check --enable-port-check --enable-suidcheck --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_nogpg "${BUILDOPTS} CFLAGS=-DSH_NOFAILOVER=1" "modrc" + do_test_1b_2 + if [ $? -eq 0 ]; then + log_ok 7 $MAXTEST 'logging to prelude' + else + log_fail 7 $MAXTEST 'logging to prelude' + fi + fi + fi fi Index: trunk/test/testrun_2d.sh =================================================================== --- trunk/test/testrun_2d.sh (revision 169) +++ trunk/test/testrun_2d.sh (revision 170) @@ -24,9 +24,18 @@ CLIENT_BUILDOPTS="--quiet $TRUST --prefix=$PW_DIR --with-tmp-dir=$PW_DIR --localstatedir=$PW_DIR --enable-network=client --disable-mail --disable-external-scripts --enable-login-watch --enable-xml-log --enable-db-reload --with-logserver=localhost --with-config-file=REQ_FROM_SERVER$PW_DIR/testrc_2 --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-log-file=$PW_DIR/.samhain_log --with-pid-file=$PW_DIR/.samhain_lock"; export CLIENT_BUILDOPTS +create_pgpass () { +touch ~/.pgpass +chmod 600 ~/.pgpass +cat > ~/.pgpass << EOF +localhost:*:samhain:samhain:samhain +EOF +} + check_psql_log () { DATE="$1" rm -f test_log_db - PGPASSWORD=samhain; export PGPASSWORD + # PGPASSWORD=samhain; export PGPASSWORD + create_pgpass psql -U samhain -d samhain -c "SELECT * FROM log WHERE entry_status = 'NEW' and log_time > '${DATE}';" >test_log_db # @@ -77,5 +86,6 @@ return 1 else - PGPASSWORD="samhain"; export PGPASSWORD + # PGPASSWORD="samhain"; export PGPASSWORD + create_pgpass TEST=`psql -U samhain -d samhain -c "SELECT * FROM log LIMIT 1;" 2>/dev/null` if [ $? -ne 0 -o -z "$TEST" ]; then