Add new asm target.

[openssl.git] / util / pl / unix.pl

diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index c5586486c0a3eab6676f299c475a7ff8c0744401..d722e051ba954f3cdc4ae1765f7a368433244512 100644 (file)
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -69,6 +69,7 @@ $bf_enc_src="";
          'rc4-x86_64' => 'crypto/rc4',
          'rc4-md5-x86_64' => 'crypto/rc4',
          'ghash-x86_64' => 'crypto/modes',
+          'aesni-gcm-x86_64' => 'crypto/modes',
          );
 
 # If I were feeling more clever, these could probably be extracted
@@ -241,18 +242,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) = @_;
@@ -340,7 +342,7 @@ sub get_tests
     $r =~ s/\.\.\/(\S+)/\$(SRC_D)\/$1/g;
     $r = fixrules($r);
 
-    $each .= "$t: test_scripts $d\n$r\n";
+    $each .= "$t: test_scripts $d\n\t\@echo '$t test started'\n$r\t\@echo '$t test done'\n\n";
     }
 
   # FIXME: Might be a clever way to figure out what needs copying
@@ -371,21 +373,26 @@ sub get_tests
                 'testreq2.pem',
                 'testp7.pem',
                 'pkcs7-1.pem',
+                'trsa',
+                'testrsa.pem',
+                'testsid.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";
   }