Changeset 44 for trunk/test

Timestamp:

Jun 5, 2006, 10:53:07 PM (18 years ago)

Author:

rainer

Message:

Improved fix for solaris package creation.

File:

• trunk/test/testrun_2a.sh (modified) (4 diffs)

trunk/test/testrun_2a.sh

@@ -25 +25 @@
 SERVER_BUILDOPTS="--quiet  $TRUST  --enable-network=server --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$PW_DIR/testrc_2 --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=${SH_LOCALHOST}  --with-log-file=$PW_DIR/.samhain_log --with-pid-file=$PW_DIR/.samhain_lock"; export SERVER_BUILDOPTS
 
-CLIENT_BUILDOPTS="--quiet  $TRUST --enable-debug --enable-network=client --enable-srp --prefix=$PW_DIR --with-tmp-dir=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$RCFILE --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=localhost  --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock"; export CLIENT_BUILDOPTS
+CLIENT_BUILDOPTS="--quiet  $TRUST --enable-debug --enable-network=client --enable-srp --prefix=$PW_DIR --with-tmp-dir=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$RCFILE --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=localhost  --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --enable-suidcheck"; export CLIENT_BUILDOPTS
 
 do_test_1_a () {
@@ -113 +113 @@
         ${TOP_SRCDIR}/configure ${CLIENT_BUILDOPTS}
         #
+        # Limit suid check
+        #
+        BASE="${PW_DIR}"; export BASE
+        #
+        if test x$? = x0; then
+                [ -z "$verbose" ] ||     log_msg_ok "configure..."; 
+                $MAKE  'DBGDEF=-DSH_SUIDTESTDIR=\"${BASE}\"' > /dev/null 2>>test_log
+                if test x$? = x0; then
+                    [ -z "$verbose" ] || log_msg_ok "make..."; 
+                else
+                    [ -z "$quiet" ] &&   log_msg_fail "make..."; 
+                    return 1
+                fi
+
+        else
+                [ -z "$quiet" ] &&       log_msg_fail "configure...";
+                return 1
+        fi
+
+        # save binary and build server
+        #
+        cp samhain samhain.build || return 1
+        $MAKE clean >/dev/null || return 1
+
+        ${TOP_SRCDIR}/configure ${SERVER_BUILDOPTS}
+        #
         if test x$? = x0; then
                 [ -z "$verbose" ] ||     log_msg_ok "configure..."; 
@@ -128 +154 @@
         fi
 
-        # save binary and build server
-        #
-        cp samhain samhain.build || return 1
-        $MAKE clean >/dev/null || return 1
-
-        ${TOP_SRCDIR}/configure ${SERVER_BUILDOPTS}
-        #
-        if test x$? = x0; then
-                [ -z "$verbose" ] ||     log_msg_ok "configure..."; 
-                $MAKE  > /dev/null 2>>test_log
-                if test x$? = x0; then
-                    [ -z "$verbose" ] || log_msg_ok "make..."; 
-                else
-                    [ -z "$quiet" ] &&   log_msg_fail "make..."; 
-                    return 1
-                fi
-
-        else
-                [ -z "$quiet" ] &&       log_msg_fail "configure...";
-                return 1
-        fi
-
 
         #####################################################################
@@ -221 +225 @@
         cp    ./testrc_2       "./rc.${ALTHOST}"
         cp    ./file.${SH_LOCALHOST} "./file.${ALTHOST}" 2>/dev/null
-
 }