diff options
| author | Father Chrysostomos <sprout@cpan.org> | 2011-12-27 12:44:43 -0800 |
|---|---|---|
| committer | Father Chrysostomos <sprout@cpan.org> | 2011-12-28 22:58:51 -0800 |
| commit | 6ad282c70d80576d5d66b25af19780fde18afd42 (patch) | |
| tree | 227bfa4478eb97ad0cced009ad4648162542301f | |
| parent | ae917476d21d843e7a5fcaff458c5ff8cad96328 (diff) | |
| download | perl-6ad282c70d80576d5d66b25af19780fde18afd42.tar.gz | |
diag_listed_as for -S error
Also teach diag.t not to mistake /* die */ for a die() call, as
it did in this case, consequently ignoring the diag_listed_as,
which it thought was in the middle of the call.
| -rw-r--r-- | t/porting/diag.t | 3 | ||||
| -rw-r--r-- | util.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/t/porting/diag.t b/t/porting/diag.t index d288c60a39..c691dfa0dc 100644 --- a/t/porting/diag.t +++ b/t/porting/diag.t @@ -219,7 +219,7 @@ sub check_file { my $multiline = 0; # Loop to accumulate the message text all on one line. - if (m/$source_msg_re/) { + if (m/$source_msg_re(?:_nocontext)?\s*\(/) { while (not m/\);$/) { my $nextline = <$codefh>; # Means we fell off the end of the file. Not terribly surprising; @@ -380,7 +380,6 @@ Can't locate object method "%s" via package "%s" (perhaps you forgot to load "%s Can't spawn "%s": %s Can't %s script `%s' with ARGV[0] being `%s' Can't %s "%s": %s -Can't %s %s Can't %s `%s' with ARGV[0] being `%s' (looking for executables only, not found) Can't take %s of %f Can't use '%c' after -mname @@ -3681,6 +3681,7 @@ Perl_find_script(pTHX_ const char *scriptname, bool dosearch, seen_dot = 1; /* Disable message. */ if (!xfound) { if (flags & 1) { /* do or die? */ + /* diag_listed_as: Can't execute %s */ Perl_croak(aTHX_ "Can't %s %s%s%s", (xfailed ? "execute" : "find"), (xfailed ? xfailed : scriptname), |