diff options
| author | Ben Laurie <ben@links.org> | 2013-04-02 06:02:13 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2013-04-06 15:13:11 +0100 |
| commit | 15e5f592c1c094e31883dd499cdfaf9760eaeafc (patch) | |
| tree | a3409f1bcff21a9b1d9d5261fa85100c5be09335 /util | |
| parent | 509a83dd365f167a997d2855f6cd417fb43d3e75 (diff) | |
Make S/MIME test work.
Diffstat (limited to 'util')
| -rw-r--r-- | util/pl/unix.pl | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/util/pl/unix.pl b/util/pl/unix.pl index c1be1fc7ec..d6b11944c3 100644 --- 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"; } |