Changeset 29 for trunk/test

Timestamp:

Apr 11, 2006, 1:48:18 PM (18 years ago)

Author:

rainer

Message:

Fixes for test suite, OpenBSD portability, self-resolving, and suidchk patch by Neil

Location:

trunk/test

Files:

• test.sh (modified) (1 diff)
• testcompile.sh (modified) (2 diffs)
• testrun_2.sh (modified) (2 diffs)
• testrun_2a.sh (modified) (2 diffs)
• testrun_2b.sh (modified) (2 diffs)

trunk/test/test.sh

@@ -185 +185 @@
 
 PW_DIR=`pwd`; export PW_DIR
+
+#
+# group/world writeable will cause problems
+#
+chmod go-w .
 #
 #

trunk/test/testcompile.sh

@@ -223 +223 @@
         if [ -z "$GPG" ]; then
             log_skip $num $MAXTEST 'gpg not in PATH'
+            let "num = num + 1" >/dev/null
         else
             if test -r "Makefile"; then
@@ -370 +371 @@
         if [ -z "$GPG" ]; then
             log_skip $num $MAXTEST 'gpg not in PATH'
-            let "num = num + 1" >/dev/null
-            log_skip $num $MAXTEST 'gpg not in PATH'
+            let "num = num + 3" >/dev/null
         else
             if test -r "Makefile"; then

trunk/test/testrun_2.sh

@@ -732 +732 @@
         rm -f ./.samhain_lock*
 
-        SHCLT=`./yule -P $SHPW | sed s%HOSTNAME%${SH_LOCALHOST}%`
+        SHCLT=`./yule -P $SHPW`
 
         if test x$? = x0; then
@@ -741 +741 @@
         fi
 
-        echo $SHCLT >> testrc_2
+        SHCLT1=`echo "${SHCLT}"  | sed s%HOSTNAME%${SH_LOCALHOST}%`
+        AHOST=`find_hostname`
+        SHCLT2=`echo "${SHCLT}"  | sed s%HOSTNAME%${AHOST}%`
+        
+
+        echo $SHCLT1 >> testrc_2
+        echo $SHCLT2 >> testrc_2
         cp testrc_2 testrc_22
 

trunk/test/testrun_2a.sh

@@ -197 +197 @@
         rm -f ./.samhain_lock
 
-        SHCLT=`./yule -P $SHPW | sed s%HOSTNAME%${SH_LOCALHOST}%`
+        SHCLT=`./yule -P $SHPW`
 
         if test x$? = x0; then
@@ -206 +206 @@
         fi
 
-        echo $SHCLT >> testrc_2
+        SHCLT1=`echo "${SHCLT}"  | sed s%HOSTNAME%${SH_LOCALHOST}%`
+        AHOST=`find_hostname`
+        SHCLT2=`echo "${SHCLT}"  | sed s%HOSTNAME%${AHOST}%`
+        
+
+        echo $SHCLT1 >> testrc_2
+        echo $SHCLT2 >> testrc_2
+
 
         cp    ./testrc_2       ./rc.${SH_LOCALHOST}

trunk/test/testrun_2b.sh

@@ -144 +144 @@
     rm -f ./.samhain_lock
     
-    SHCLT=`./yule -P $SHPW | sed s%HOSTNAME%${SH_LOCALHOST}%`
+    SHCLT=`./yule -P $SHPW`
     
     if test x$? = x0; then
@@ -153 +153 @@
     fi
     
-    echo $SHCLT >> testrc_2
+    SHCLT1=`echo "${SHCLT}"  | sed s%HOSTNAME%${SH_LOCALHOST}%`
+    AHOST=`find_hostname`
+    SHCLT2=`echo "${SHCLT}"  | sed s%HOSTNAME%${AHOST}%`
+        
+
+    echo $SHCLT1 >> testrc_2
+    echo $SHCLT2 >> testrc_2
+
     
     cp    "${RCFILE_C}"              ./rc.${SH_LOCALHOST}