From 51ae39ff4f89851c9b7022b364cfc3fdf0c1a005 Mon Sep 17 00:00:00 2001
From: "Paul \"LeoNerd\" Evans" <leonerd@leonerd.org.uk>
Date: Thu, 27 Jul 2023 16:15:41 +0100
Subject: [PATCH] Split out the parts of lib/builtin.t that require -T into a
 separate file

---
 MANIFEST               |  1 +
 Porting/Maintainers.pl |  1 +
 lib/builtin-taint.t    | 40 ++++++++++++++++++++++++++++++++++++++++
 lib/builtin.t          | 21 +--------------------
 4 files changed, 43 insertions(+), 20 deletions(-)
 create mode 100644 lib/builtin-taint.t

diff --git a/MANIFEST b/MANIFEST
index 57a98e32f490..0068fcc863b6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -5065,6 +5065,7 @@ lib/blib.pm				For "use blib"
 lib/blib.t				blib.pm test
 lib/builtin.pm				builtin function namespace
 lib/builtin.t				test builtin function namespace
+lib/builtin-taint.t			test builtin function namespace in taint mode
 lib/bytes.pm				Pragma to enable byte operations
 lib/bytes.t				bytes.pm test
 lib/bytes_heavy.pl			Support routines for byte pragma
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 7e7be6a59242..cc1b2f94d995 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1451,6 +1451,7 @@ package Maintainers;
                 lib/_charnames.pm
                 lib/blib.{pm,t}
                 lib/builtin.{pm,t}
+                lib/builtin-taint.t
                 lib/bytes.{pm,t}
                 lib/bytes_heavy.pl
                 lib/charnames.{pm,t}
diff --git a/lib/builtin-taint.t b/lib/builtin-taint.t
new file mode 100644
index 000000000000..15900863762b
--- /dev/null
+++ b/lib/builtin-taint.t
@@ -0,0 +1,40 @@
+#!./perl -T
+
+BEGIN {
+    chdir 't' if -d 't';
+    require './test.pl';
+    set_up_inc('../lib');
+}
+
+use v5.36;
+no warnings 'experimental::builtin';
+
+package FetchStoreCounter {
+    sub TIESCALAR($class, @args) { bless \@args, $class }
+
+    sub FETCH($self)    { $self->[0]->$*++ }
+    sub STORE($self, $) { $self->[1]->$*++ }
+}
+
+# is_tainted
+{
+    use builtin qw( is_tainted );
+
+    is(is_tainted($0), !!${^TAINT}, "\$0 is tainted (if tainting is supported)");
+    ok(!is_tainted($1), "\$1 isn't tainted");
+
+    # Invokes magic
+    tie my $tied, FetchStoreCounter => (\my $fetchcount, \my $storecount);
+
+    my $_dummy = is_tainted($tied);
+    is($fetchcount, 1, 'is_tainted() invokes FETCH magic');
+
+    $tied = is_tainted($0);
+    is($storecount, 1, 'is_tainted() invokes STORE magic');
+
+    is(prototype(\&builtin::is_tainted), '$', 'is_tainted prototype');
+}
+
+# vim: tabstop=4 shiftwidth=4 expandtab autoindent softtabstop=4
+
+done_testing();
diff --git a/lib/builtin.t b/lib/builtin.t
index ea106205a72d..a552e473121b 100644
--- a/lib/builtin.t
+++ b/lib/builtin.t
@@ -1,4 +1,4 @@
-#!./perl -T
+#!./perl
 
 BEGIN {
     chdir 't' if -d 't';
@@ -366,25 +366,6 @@ TODO: {
     is(trim($str2), "Hello world!", "trim on an our \$var");
 }
 
-# is_tainted
-{
-    use builtin qw( is_tainted );
-
-    is(is_tainted($0), !!${^TAINT}, "\$0 is tainted (if tainting is supported)");
-    ok(!is_tainted($1), "\$1 isn't tainted");
-
-    # Invokes magic
-    tie my $tied, FetchStoreCounter => (\my $fetchcount, \my $storecount);
-
-    my $_dummy = is_tainted($tied);
-    is($fetchcount, 1, 'is_tainted() invokes FETCH magic');
-
-    $tied = is_tainted($0);
-    is($storecount, 1, 'is_tainted() invokes STORE magic');
-
-    is(prototype(\&builtin::is_tainted), '$', 'is_tainted prototype');
-}
-
 # Lexical export
 {
     my $name;