Make S/MIME test work.

diff --git a/test/Makefile b/test/Makefile
index 0b36ae5de42fb73b1defa56881ee5d434ad6c292..3063bcad83898975274b7f5369bb2750d6106bba 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -363,7 +363,7 @@ test_jpake: $(JPAKETEST)$(EXE_EXT)
        @echo "Test JPAKE"
        ../util/shlib_wrap.sh ./$(JPAKETEST)
 
-test_cms: ../apps/openssl cms-test.pl
+test_cms: ../apps/openssl cms-test.pl smcont.txt
        @echo "CMS consistency test"
        $(PERL) cms-test.pl
 

diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index c1be1fc7ec057b75b6debc4d8c33ce5c79c2d930..d6b11944c386beb2669bf31a31bcc76106d51bf7 100644 (file)
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -241,18 +241,19 @@ sub fixrules
 
 sub copy_scripts
   {
-  my ($src, @targets) = @_;
+  my ($sed, $src, @targets) = @_;
 
   my $s = '';
   foreach my $t (@targets)
     {
     # Copy first so we get file modes...
-    $s .= "\$(TEST_D)/$t: \$(SRC_D)/$src/$t\n\tcp \$(SRC_D)/$src/$t \$(TEST_D)/$t\n\tsed -e 's/\\.\\.\\/apps/..\\/\$(OUT_D)/' -e 's/\\.\\.\\/util/..\\/\$(TEST_D)/' < \$(SRC_D)/$src/$t > \$(TEST_D)/$t\n\n";
+    $s .= "\$(TEST_D)/$t: \$(SRC_D)/$src/$t\n\tcp \$(SRC_D)/$src/$t \$(TEST_D)/$t\n";
+    $s .= "\tsed -e 's/\\.\\.\\/apps/..\\/\$(OUT_D)/' -e 's/\\.\\.\\/util/..\\/\$(TEST_D)/' < \$(SRC_D)/$src/$t > \$(TEST_D)/$t\n" if $sed;
+    $s .= "\n";
     }
   return $s;
   }
 
-
 sub get_tests
   {
   my ($makefile) = @_;
@@ -374,20 +375,22 @@ sub get_tests
                 'trsa',
                 'testrsa.pem',
               );
-  my $copies = copy_scripts('test', @copies);
+  my $copies = copy_scripts(1, 'test', @copies);
+  $copies .= copy_scripts(0, 'test', ('smcont.txt'));
 
   my @utils = ( 'shlib_wrap.sh',
                'opensslwrap.sh',
              );
-  $copies .= copy_scripts('util', @utils);
+  $copies .= copy_scripts(1, 'util', @utils);
 
   my @apps = ( 'CA.sh',
               'openssl.cnf',
             );
-  $copies .= copy_scripts('apps', @apps);
+  $copies .= copy_scripts(1, 'apps', @apps);
 
-  $scripts = "test_scripts: \$(TEST_D)/CA.sh \$(TEST_D)/opensslwrap.sh \$(TEST_D)/openssl.cnf ocsp\n";
+  $scripts = "test_scripts: \$(TEST_D)/CA.sh \$(TEST_D)/opensslwrap.sh \$(TEST_D)/openssl.cnf ocsp smime\n";
   $scripts .= "\nocsp:\n\tcp -R test/ocsp-tests \$(TEST_D)\n";
+  $scripts .= "\smime:\n\tcp -R test/smime-certs \$(TEST_D)\n";
 
   return "$scripts\n$copies\n$tests\n$all\n\n$each";
   }