Changeset 561 for trunk/test

Timestamp:

Jun 29, 2021, 10:19:30 PM (3 years ago)

Author:

katerina

Message:

Fix for ticket #451 (signify-openbsd in client/server mode not working).

Location:

trunk/test

Files:

• test.sh (modified) (5 diffs)
• testrun_1i.sh (modified) (1 diff)
• testrun_2h.sh (added)

trunk/test/test.sh

@@ -164 +164 @@
     echo "  ${S}test.sh 26${E}  -- Test c/s case one        (testrc_2.in)"
     echo "  ${S}test.sh 27${E}  -- Test c/s case two        (testrc_2.in)"
+    echo "  ${S}test.sh 28${E}  -- Test full c/s w/signify  (testrc_2.in)"
     echo "  ${S}test.sh all${E} -- All tests"
 }
@@ -175 +176 @@
     echo " (20) testrun_2.sh  (21) testrun_2a.sh  (22) testrun_2b.sh (23) testrun_2c.sh"
     echo " (24) testrun_2d.sh (25) testrun_2e.sh  (26) testrun_2f.sh (27) testrun_2g.sh"
-}
+    echo " (28) testrun_2h.sh"
+    }
 
 #
@@ -715 +717 @@
     exit $?
 fi
+if test x$1 = x28; then
+    . ${SCRIPTDIR}/testrun_2a.sh
+    . ${SCRIPTDIR}/testrun_2h.sh
+    testrun2h $hostname
+    print_summary
+    exit $?
+fi
 if test x$1 = xall; then
     TEST_MAX=0
@@ -760 +769 @@
     let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null
     . ${SCRIPTDIR}/testrun_2g.sh
+    let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null
+    . ${SCRIPTDIR}/testrun_2h.sh
     let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null
     #
@@ -854 +865 @@
     MAXTEST=${TEST_MAX}; export MAXTEST
     testrun2g $hostname
+    #
+    . ${SCRIPTDIR}/testrun_2h.sh
+    MAXTEST=${TEST_MAX}; export MAXTEST
+    testrun2h $hostname
     #
     print_summary

trunk/test/testrun_1i.sh

@@ -244 +244 @@
     fi
     if [ -z "$SIGNIFY" ]; then
-        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'
-        log_skip 4 $MAXTEST 'gpg not found in $PATH'
+        log_skip 1 $MAXTEST 'signify not found in $PATH'
+        log_skip 2 $MAXTEST 'signify not found in $PATH'
+        log_skip 3 $MAXTEST 'signify not found in $PATH'
+        log_skip 4 $MAXTEST 'signify not found in $PATH'
     else
         eval "ls ~/.signify/samhain.pub >/dev/null 2>/dev/null"