Fix test_ss.

diff --git a/test/Makefile b/test/Makefile
index 67243ea747afe60d6ce08b58b89600e3532d248e..df1514bf7238190bec3517a30c177e6b2af0cd2b 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -318,7 +318,8 @@ test_gen: ../apps/openssl testgen test.cnf
        @sh ./testgen
 
 test_ss keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
-               intP1.ss intP2.ss: testss CAss.cnf Uss.cnf P1ss.cnf P2ss.cnf
+               intP1.ss intP2.ss: testss CAss.cnf Uss.cnf P1ss.cnf P2ss.cnf \
+                                   ../apps/openssl
        @echo "Generate and certify a test certificate"
        @sh ./testss
        @cat certCA.ss certU.ss > intP1.ss

diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index d722e051ba954f3cdc4ae1765f7a368433244512..cb1bbe56f047c8fcad8075cc16fce617ad781ca6 100644 (file)
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -320,16 +320,6 @@ sub get_tests
     {
     next if $t eq '';
 
-    if ($t =~ /^test_ss/)
-      {
-      $t =~ s/\s+/ \$(TEST_D)\//g;
-      $all .= ' test_ss';
-      }
-    else
-      {
-      $all .= " $t";
-      }
-
     my $d = $deps{$t};
     $d =~ s/\.\.\/apps/\$(BIN_D)/g;
     $d =~ s/\.\.\/util/\$(TEST_D)/g;
@@ -342,6 +332,18 @@ sub get_tests
     $r =~ s/\.\.\/(\S+)/\$(SRC_D)\/$1/g;
     $r = fixrules($r);
 
+    next if $r eq '';
+
+    if ($t =~ /^test_ss/)
+      {
+      $t =~ s/\s+/ \$(TEST_D)\//g;
+      $all .= ' test_ss';
+      }
+    else
+      {
+      $all .= " $t";
+      }
+
     $each .= "$t: test_scripts $d\n\t\@echo '$t test started'\n$r\t\@echo '$t test done'\n\n";
     }
 
@@ -376,6 +378,7 @@ sub get_tests
                 'trsa',
                 'testrsa.pem',
                 'testsid.pem',
+                'testss',
               );
   my $copies = copy_scripts(1, 'test', @copies);
   $copies .= copy_scripts(0, 'test', ('smcont.txt'));