Merge pull request Perl#17 in CB/perl5 from cbrunperl to ios_blead_test

jpalao · jpalao · commit e656972cc575 · 2021-12-04T14:58:18.000+01:00
* commit '65fa5ed3c8be29d387a6a5fa874e2f1268c66eeb':
  fixes
  cbrunperl.pm-&gt;ios.pm
diff --git a/MANIFEST b/MANIFEST
@@ -4837,7 +4837,7 @@ lib/blib.t			blib.pm test
 lib/bytes.pm			Pragma to enable byte operations
 lib/bytes.t			bytes.pm test
 lib/bytes_heavy.pl		Support routines for byte pragma
-lib/cbrunperl.pm		iOS library
+lib/ios.pm			iOS library
 lib/charnames.pm		Character names
 lib/charnames.t			See if character names work
 lib/Class/Struct.pm		Declare struct-like datatypes as Perl classes
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
@@ -1438,7 +1438,7 @@ package Maintainers;
                 lib/blib.{pm,t}
                 lib/bytes.{pm,t}
                 lib/bytes_heavy.pl
-                lib/cbrunperl.pm
+                lib/ios.pm
                 lib/charnames.{pm,t}
                 lib/dbm_filter_util.pl
                 lib/deprecate.pm
diff --git a/README.ios b/README.ios
@@ -330,7 +330,7 @@ where you can also run Instruments.
 
 `runperl` functionality is currently provided through CamelBones. The
 runperl config hash used in t/harness is converted to JSON and passed as
-a simple scalar to the CBRunPerl XS method of CamelBones, which decodes
+a simple scalar to the ios XS method of CamelBones, which decodes
 the string into JSON, and executes and captures the output of the test.
 All perl interpreters are spawned as new threads, i.e. runperl. Perl
 never runs in the main thread.
diff --git a/cpan/Archive-Tar/t/08_ptargrep.t b/cpan/Archive-Tar/t/08_ptargrep.t
@@ -6,7 +6,7 @@ use File::Spec;
 use FindBin '$Bin';
 use Archive::Tar;
 if ($^O =~ /darwin-ios/) {
-    use cbrunperl;
+    use ios;
 }
 
 # filenames
diff --git a/cpan/AutoLoader/t/02AutoSplit.t b/cpan/AutoLoader/t/02AutoSplit.t
@@ -29,7 +29,7 @@ use File::Find;
 my $Is_ios = $^O =~ /darwin-ios/;
 if ($Is_ios) {
     use Cwd qw(getcwd);
-    use cbrunperl;
+    use ios;
 }
 
 my $Is_VMS   = $^O eq 'VMS';
diff --git a/cpan/Filter-Util-Call/t/call.t b/cpan/Filter-Util-Call/t/call.t
@@ -3,7 +3,7 @@ use Config;
 BEGIN {
     if ($^O =~ /darwin-ios/) {
         use lib '../lib';
-        require 'cbrunperl.pm';
+        require 'ios.pm';
     }
     if ($ENV{PERL_CORE}) {
         if ($Config{'extensions'} !~ m{\bFilter/Util/Call\b}) {
diff --git a/cpan/Filter-Util-Call/t/rt_54452-rebless.t b/cpan/Filter-Util-Call/t/rt_54452-rebless.t
@@ -17,7 +17,7 @@ use strict;
 use warnings;
 
 if ($^O =~ /darwin-ios/) {
-    use cbrunperl;
+    use ios;
 }
 
 use FindBin;
diff --git a/cpan/Pod-Usage/t/pod/headwithmarkup.t b/cpan/Pod-Usage/t/pod/headwithmarkup.t
@@ -2,7 +2,7 @@ use Test::More tests => 1;
 
 BEGIN {
     if ($^O =~ /darwin-ios/) {
-        require 'cbrunperl.pm';
+        require 'ios.pm';
     }
 }
 
diff --git a/cpan/Pod-Usage/t/pod/selectheaders.t b/cpan/Pod-Usage/t/pod/selectheaders.t
@@ -2,7 +2,7 @@ use Test::More tests => 2;
 
 BEGIN {
     if ($^O =~ /darwin-ios/) {
-        require 'cbrunperl.pm';
+        require 'ios.pm';
     }
 }
 
diff --git a/cpan/Pod-Usage/t/pod/selectsections.t b/cpan/Pod-Usage/t/pod/selectsections.t
@@ -2,7 +2,7 @@ use Test::More tests => 2;
 
 BEGIN {
     if ($^O =~ /darwin-ios/) {
-        require 'cbrunperl.pm';
+        require 'ios.pm';
     }
 }
 
diff --git a/cpan/Test-Harness/lib/TAP/Parser/Iterator/iOS.pm b/cpan/Test-Harness/lib/TAP/Parser/Iterator/iOS.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Data::Dumper;
 use Cwd qw/getcwd/;
-use cbrunperl;
+use ios;
 
 use base 'TAP::Parser::Iterator';
 
diff --git a/cpan/Test-Simple/t/Legacy/exit.t b/cpan/Test-Simple/t/Legacy/exit.t
@@ -25,7 +25,7 @@ my $Orig_Dir = cwd;
 
 if ($^O =~ /darwin-ios/) {
     use Cwd qw/getcwd/;
-    use cbrunperl;
+    use ios;
 };
 
 my $Perl = File::Spec->rel2abs($^X);
diff --git a/dist/Devel-SelfStubber/t/Devel-SelfStubber.t b/dist/Devel-SelfStubber/t/Devel-SelfStubber.t
@@ -5,7 +5,7 @@ use Devel::SelfStubber;
 use File::Spec::Functions;
 
 if ($^O =~ /darwin-ios/) {
-    use cbrunperl;
+    use ios;
 }
 
 my $runperl = $^X;
diff --git a/dist/IO/t/io_dup.t b/dist/IO/t/io_dup.t
@@ -11,7 +11,7 @@ BEGIN {
     }
     if ($^O =~ /darwin-ios/) {
         use Cwd qw(getcwd);
-        require 'cbrunperl.pm';
+        require 'ios.pm';
     }
 }
 
@@ -55,7 +55,7 @@ $stderr->fdopen($duperr,"w");
 
 if ($^O eq 'MSWin32' || $^O eq 'NetWare' || $^O eq 'VMS') { print `type Io.dup` }
 elsif ($^O eq 'MacOS') { system 'Catenate Io.dup' }
-elsif ($^O =~ /darwin-ios/) { cbrunperl::cat(getcwd() . '/Io.dup') }
+elsif ($^O =~ /darwin-ios/) { ios::cat(getcwd() . '/Io.dup') }
 else                   { system 'cat Io.dup' }
 unlink 'Io.dup';
 
diff --git a/dist/PathTools/t/rel2abs2rel.t b/dist/PathTools/t/rel2abs2rel.t
@@ -7,7 +7,7 @@ use File::Spec;
 use lib File::Spec->catdir('t', 'lib');
 
 if ($^O =~ /darwin-ios/) {
-    use cbrunperl;
+    use ios;
 }
 
 use Test::More (-x $^X
diff --git a/dist/Time-HiRes/t/ualarm.t b/dist/Time-HiRes/t/ualarm.t
@@ -7,7 +7,7 @@ BEGIN {
         Test::More::plan(skip_all => "no ualarm()");
     }
     if ($^O =~ /darwin-ios/) {
-        require 'cbrunperl.pm';
+        require 'ios.pm';
     }
 }
 
diff --git a/ext/B/t/showlex.t b/ext/B/t/showlex.t
@@ -15,7 +15,7 @@ use warnings;
 use strict;
 use Config;
 if ($^O =~ /darwin-ios/) {
-    use cbrunperl;
+    use ios;
 }
 use B::Showlex ();
 
diff --git a/ext/B/t/terse.t b/ext/B/t/terse.t
@@ -8,7 +8,7 @@ BEGIN {
 		exit 0;
 	}
 	if ($^O =~ /darwin-ios/) {
-        require 'cbrunperl.pm';
+        require 'ios.pm';
     }
 }
 
diff --git a/ext/Devel-Peek/t/Peek.t b/ext/Devel-Peek/t/Peek.t
@@ -12,7 +12,7 @@ BEGIN {
        require($core ? '../../t/test.pl' : './t/test.pl');
     }
     if ($^O =~ /darwin-ios/) {
-        require 'cbrunperl.pm';
+        require 'ios.pm';
     }
 }
 
diff --git a/ext/POSIX/t/posix.t b/ext/POSIX/t/posix.t
@@ -8,7 +8,7 @@ BEGIN {
     }
     unshift @INC, "../../t";
     if ($^O =~ /darwin-ios/) {
-        require 'cbrunperl.pm';
+        require 'ios.pm';
     }
     require 'loc_tools.pl';
 }
diff --git a/ext/POSIX/t/wrappers.t b/ext/POSIX/t/wrappers.t
@@ -2,7 +2,7 @@
 
 BEGIN {
     if ($^O =~ /darwin-ios/) {
-        require 'cbrunperl.pm';
+        require 'ios.pm';
     }
 }
 
diff --git a/lib/h2xs.t b/lib/h2xs.t
@@ -29,7 +29,7 @@ use ExtUtils::Manifest;
 use Config;
 
 if ($^O =~ /darwin-ios/) {
-    use cbrunperl;
+    use ios;
 }
 
 # Don't want its diagnostics getting in the way of ours.
diff --git a/lib/ios.pm b/lib/ios.pm
@@ -1,19 +1,21 @@
-package cbrunperl;
+package ios;
 
 =head1 NAME
-cbrunperl.pm
+ios.pm
 =cut
 
 BEGIN {
-    *CORE::GLOBAL::readpipe = sub {
-        my ($code, $result);
-        eval {
-            ($code, $result) = exec_cli(getcwd(), "@_")
+    if ($^O =~ /darwin-ios/) {
+        *CORE::GLOBAL::readpipe = sub {
+            my ($code, $result);
+            eval {
+                ($code, $result) = exec_cli(getcwd(), "@_")
+            };
+            $code = $code >> 8 if defined $code;
+            $? = $code;
+            return $result;
         };
-        $code = $code >> 8 if defined $code;
-        $? = $code;
-        return $result;
-    };
+    }
 }
 
 # auto-flush on socket
@@ -49,7 +51,7 @@ my $json = JSON::PP->new->convert_blessed(1);
 
 sub check_error {
   my ($error) = @_;
-  warn "CBRunPerl error: $error" if $error;
+  warn "ios error: $error" if $error;
 }
 
 sub yield {
diff --git a/t/base/term.t b/t/base/term.t
@@ -4,7 +4,7 @@ BEGIN {
     chdir 't' if -d 't';
 	if ($^O =~ /darwin-ios/) {
 	    use lib '../lib';
-        require 'cbrunperl.pm';
+        require 'ios.pm';
     }
 }
 
diff --git a/t/op/magic.t b/t/op/magic.t
@@ -9,7 +9,7 @@ BEGIN {
 }
 
 if ($^O =~ /darwin-ios/) {
-    use cbrunperl;
+    use ios;
 }
 
 # Test that defined() returns true for magic variables created on the fly,
diff --git a/t/porting/perlfunc.t b/t/porting/perlfunc.t
@@ -29,7 +29,7 @@ use Config;
 use TestInit qw(T A); # T is chdir to the top level, A makes paths absolute
 
 if ($^O =~ /darwin-ios/) {
-    use cbrunperl;
+    use ios;
 }
 
 if ( $Config{usecrosscompile} ) {
diff --git a/t/test.pl b/t/test.pl
@@ -38,8 +38,8 @@
 
 if ($^O =~ /darwin-ios/) {
     use Cwd qw/getcwd/;
-    use cbrunperl;
-    $cbrunperl::DEBUG = 0;
+    use ios;
+    $ios::DEBUG = 0;
 }
 
 # Use this instead of print to avoid interference while testing globals.

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ use File::Spec;`
`6`	`6`	`use FindBin '$Bin';`
`7`	`7`	`use Archive::Tar;`
`8`	`8`	`if ($^O =~ /darwin-ios/) {`
`9`		`- use cbrunperl;`
	`9`	`+ use ios;`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`# filenames`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ use File::Find;`
`29`	`29`	`my $Is_ios = $^O =~ /darwin-ios/;`
`30`	`30`	`if ($Is_ios) {`
`31`	`31`	`use Cwd qw(getcwd);`
`32`		`- use cbrunperl;`
	`32`	`+ use ios;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`my $Is_VMS = $^O eq 'VMS';`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ use Config;`
`3`	`3`	`BEGIN {`
`4`	`4`	`if ($^O =~ /darwin-ios/) {`
`5`	`5`	`use lib '../lib';`
`6`		`- require 'cbrunperl.pm';`
	`6`	`+ require 'ios.pm';`
`7`	`7`	`}`
`8`	`8`	`if ($ENV{PERL_CORE}) {`
`9`	`9`	`if ($Config{'extensions'} !~ m{\bFilter/Util/Call\b}) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ use strict;`
`17`	`17`	`use warnings;`
`18`	`18`
`19`	`19`	`if ($^O =~ /darwin-ios/) {`
`20`		`- use cbrunperl;`
	`20`	`+ use ios;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`use FindBin;`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ use Test::More tests => 1;`
`2`	`2`
`3`	`3`	`BEGIN {`
`4`	`4`	`if ($^O =~ /darwin-ios/) {`
`5`		`- require 'cbrunperl.pm';`
	`5`	`+ require 'ios.pm';`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`