From ea4507ee1ca3a5d9697075ff24eab89fa5711d6b Mon Sep 17 00:00:00 2001
From: Ben Laurie <ben@links.org>
Date: Wed, 3 Apr 2013 06:50:47 +0100
Subject: [PATCH] Fix test_ss.

---
 test/Makefile   |  3 ++-
 util/pl/unix.pl | 23 +++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 67243ea747..df1514bf72 100644
--- 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 d722e051ba..cb1bbe56f0 100644
--- 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'));
-- 
2.25.1