diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-04-21 20:09:36 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-09-07 16:10:58 +0200 |
| commit | fd9ad2300b280c0f71d24456bfbf04579331bc94 (patch) | |
| tree | 37265c65bf6e1c19a28c977d0b60684f1750f36f /util/mk1mf.pl | |
| parent | 93de4f58ef8be2cb764343cb3102d41c81f11593 (diff) | |
| download | openssl-fd9ad2300b280c0f71d24456bfbf04579331bc94.tar.gz | |
Adapt mk1mf.pl and helpers to the new testing framework.
With the new testing framework, building a test target with mk1mf.pl
becomes a very simple thing. And especially, no more need to do the
amount of hackery in unix.pl we did.
Also, some tests need a working apps/CA.pl as well as rehashed certs
in certs/demo. So, move the code creating those files so it gets done
regardless, not just in non-mk1mf environments.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'util/mk1mf.pl')
| -rwxr-xr-x | util/mk1mf.pl | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 6091a69519..9d8a47df4b 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -752,7 +752,9 @@ headers: \$(HEADER) lib: \$(LIBS_DEP) \$(E_SHLIB) -exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep +exe: apps testapps +apps: \$(BIN_D)$o\$(E_EXE)$exep +testapps: \$(T_EXE) install: all \$(MKDIR) \"\$(INSTALLTOP)\" @@ -777,15 +779,8 @@ reallyclean: EOF -if ($orig_platform ne 'copy') - { - $rules .= <<"EOF"; -test: \$(T_EXE) - cd \$(BIN_D) - ..${o}ms${o}test - -EOF - } +$rules .= &do_rehash_rule("rehash", "certs apps"); +$rules .= &do_test_rule("test", "rehash", "run_tests.pl"); my $platform_cpp_symbol = "MK1MF_PLATFORM_$platform"; $platform_cpp_symbol =~ s/-/_/g; @@ -1004,8 +999,6 @@ if ($fips) $rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)", ($fips && !$shlib) ? 2 : 0); -$rules .= get_tests('test/Makefile') if $orig_platform eq 'copy'; - print $defs; if ($platform eq "linux-elf") { |