diff -ruN perl-5.28.2-orig/t/porting/libperl.t perl-5.28.2/t/porting/libperl.t --- perl-5.28.2-orig/t/porting/libperl.t 2018-11-01 17:07:59.000000000 -0500 +++ perl-5.28.2/t/porting/libperl.t 2020-09-30 05:43:25.000000000 -0500 @@ -437,7 +437,7 @@ $symbols{data}{common} = $symbols{data}{bss}; } - ok($symbols{data}{common}{PL_hash_seed}{'globals.o'}, "has PL_hash_seed"); + ok(!$symbols{data}{common}{PL_hash_seed}{'globals.o'}, "has no PL_hash_seed"); ok($symbols{data}{data}{PL_ppaddr}{'globals.o'}, "has PL_ppaddr"); # None of the GLOBAL_STRUCT* business here. @@ -574,9 +574,11 @@ while (<$nm_err_fh>) { # OS X has weird error where nm warns about # "no name list" but then outputs fine. - if (/nm: no name list/ && $^O eq 'darwin') { - print "# $^O ignoring $nm output: $_"; - next; + if ( $^O eq 'darwin' ) { + if (/nm: no name list/ || /^(.*: )?no symbols$/ ) { + print "# $^O ignoring $nm output: $_"; + next; + } } warn "$0: Unexpected $nm error: $_"; $error++; From b1db17763c817dd84f06c0147a2bc60fe1bfe639 Mon Sep 17 00:00:00 2001 From: Tony Cook Date: Wed, 24 May 2023 13:22:38 +1000 Subject: [PATCH] porting/libperl.t: handle nm output on Mac OS Ventura 13.4 Fixes #21117 --- t/porting/libperl.t | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/porting/libperl.t b/t/porting/libperl.t index 68da29b7cf67..6d05a2be007e 100644 --- a/t/porting/libperl.t +++ b/t/porting/libperl.t @@ -245,7 +245,8 @@ sub nm_parse_gnu { sub nm_parse_darwin { my $symbols = shift; my $line = $_; - if (m{^(?:.+)?libperl\.a\((\w+\.o)\):$}) { + if (m{^(?:.+)?libperl\.a\((\w+\.o)\):$} || + m{^(\w+\.o):$}) { # object file name $symbols->{obj}{$1}++; $symbols->{o} = $1;