From 8effd8fa67689e1d4318cfda21604eef428a37cf Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 14 Sep 2018 14:59:40 +0200 Subject: Refactor util/mkdef.pl for clearer separation of functionality Move the .num updating functionality to util/mknum.pl. Rewrite util/mkdef.pl to create .def / .map / .opt files exclusively, using the separate ordinals reading module. Adapt the build files. Adapt the symbol presence test. Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/7191) --- test/recipes/01-test_symbol_presence.t | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t index 7f2a2d75b8..015dee95d2 100644 --- a/test/recipes/01-test_symbol_presence.t +++ b/test/recipes/01-test_symbol_presence.t @@ -49,8 +49,9 @@ foreach my $libname (@libnames) { my @def_lines; indir $bldtop => sub { my $mkdefpath = srctop_file("util", "mkdef.pl"); - @def_lines = map { s|\R$||; $_ } `$^X $mkdefpath $libname linux 2> /dev/null`; - ok($? == 0, "running 'cd $bldtop; $^X $mkdefpath $libname linux' => $?"); + my $libnumpath = srctop_file("util", "lib$libname.num"); + @def_lines = map { s|\R$||; $_ } `$^X $mkdefpath --ordinals $libnumpath --name $libname --OS linux 2> /dev/null`; + ok($? == 0, "running 'cd $bldtop; $^X $mkdefpath --ordinals $libnumpath --name $libname --OS linux' => $?"); }, create => 0, cleanup => 0; note "Number of lines in \@nm_lines before massaging: ", scalar @nm_lines; -- cgit v1.2.3