make update

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

diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index df4de71f5067f872ed625fe972c666145081930f..40bbe0d84212590294aaa2b9b1ce5f0da8e3f6e2 100644 (file)
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -230,8 +230,8 @@ sub fixrules
   my ($str) = @_;
 
   # Compatible with -j...
-  $str =~ s/^(\s+@?)/$1cd \$(TEST_D) && /;
-  return $str;
+#  $str =~ s/^(\s+@?)/$1cd \$(TEST_D) && /;
+#  return $str;
 
   # Compatible with not -j.
   my @t = split("\n", $str);
@@ -243,11 +243,11 @@ sub fixrules
     if (!$prev)
       {
       if ($t =~ /^@/)
-       {
+        {
         $t =~ s/^@/\@cd \$(TEST_D) && /;
         }
-      elsif ($t !~ /^\s*#/)
-       {
+      elsif ($t !~ /^\s*#/ && $t !~ /^echo/)
+        {
         $t = 'cd $(TEST_D) && ' . $t;
         }
       }
@@ -393,6 +393,7 @@ sub get_tests
                 'treq',
                 'tpkcs7',
                 'tpkcs7d',
+                'tkey',
                 'testcrl.pem',
                 'testx509.pem',
                 'v3-cert1.pem',
@@ -401,7 +402,12 @@ sub get_tests
                 'testp7.pem',
                 'pkcs7-1.pem',
                 'trsa',
+                'testdsa.pem',
+                'testdsapub.pem',
+                'testec-p256.pem',
+                'testecpub-p256.pem',
                 'testrsa.pem',
+                'testrsapub.pem',
                 'testsid.pem',
                 'testss',
                 'testssl',
@@ -409,22 +415,21 @@ sub get_tests
                 'serverinfo.pem',
               );
   my $copies = copy_scripts(1, 'test', @copies);
-  $copies .= copy_scripts(0, 'test', ('smcont.txt'));
+  $copies .= copy_scripts(0, 'test', ('smcont.txt', 'evptests.txt'));
+
 
   my @utils = ( 'shlib_wrap.sh',
                'opensslwrap.sh',
              );
   $copies .= copy_scripts(1, 'util', @utils);
 
-  my @apps = ( 'CA.sh',
+  my @apps = ( 'CA.pl',
               'openssl.cnf',
               'server2.pem',
             );
   $copies .= copy_scripts(1, 'apps', @apps);
 
-  $copies .= copy_scripts(1, 'crypto/evp', ('evptests.txt'));
-
-  $scripts = "test_scripts: \$(TEST_D)/CA.sh \$(TEST_D)/opensslwrap.sh \$(TEST_D)/openssl.cnf \$(TEST_D)/shlib_wrap.sh ocsp smime\n";
+  $scripts = "test_scripts: \$(TEST_D)/CA.pl \$(TEST_D)/opensslwrap.sh \$(TEST_D)/openssl.cnf \$(TEST_D)/shlib_wrap.sh 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";