Re-enable testing of ciphersuites

[openssl.git] / test / recipes / 01-test_symbol_presence.t

diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t
index 32827f573e760acde1ef86b0efab83dcd4c2733d..9df57de421e81187a49889e1a5890675c8da25ee 100644 (file)
--- a/test/recipes/01-test_symbol_presence.t
+++ b/test/recipes/01-test_symbol_presence.t
@@ -1,8 +1,8 @@
 #! /usr/bin/env perl
 # -*- mode: Perl -*-
-# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
 #
-# Licensed under the OpenSSL license (the "License").  You may not use
+# Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
 # in the file LICENSE in the source distribution or at
 # https://www.openssl.org/source/license.html
@@ -14,6 +14,7 @@ use OpenSSL::Test::Utils;
 
 setup("test_symbol_presence");
 
+plan skip_all => "Test is disabled on NonStop" if config('target') =~ m|^nonstop|;
 plan skip_all => "Only useful when building shared libraries"
     if disabled("shared");
 
@@ -23,7 +24,7 @@ my $testcount = scalar @libnames;
 plan tests => $testcount * 2;
 
 note
-    "NOTE: developper test!  It's possible that it won't run on your\n",
+    "NOTE: developer test!  It's possible that it won't run on your\n",
     "platform, and that's perfectly fine.  This is mainly for developers\n",
     "on Unix to check that our shared libraries are consistent with the\n",
     "ordinals (util/*.num in the source tree), something that should be\n",
@@ -49,8 +50,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;
@@ -69,6 +71,7 @@ foreach my $libname (@libnames) {
             map { s|;||; s|\s+||g; $_ }
             grep { $in_global = 1 if m|global:|;
                    $in_global = 0 if m|local:|;
+                   $in_global = 0 if m|\}|;
                    $in_global && m|;|; } @def_lines;
 
         note "Number of lines in \@nm_lines after massaging: ", scalar @nm_lines;