From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 18 Jun 2001 13:32:13 +0000 (+0000)
Subject: Move the locale/strict/warnings helper files back
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8a6cb2cbf33b292e9c5c2689417fb9f525f67df2;p=p5sagit%2Fp5-mst-13.2.git

Move the locale/strict/warnings helper files back
under the t/lib; this way the amount of non-installabled
stuff under lib/ stays smaller.

p4raw-id: //depot/perl@10686
---

diff --git a/MANIFEST b/MANIFEST
index 403305e..9026368 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1216,8 +1216,6 @@ lib/less.pm			For "use less"
 lib/lib_pm.PL			For "use lib", produces lib/lib.pm
 lib/locale.pm			For "use locale"
 lib/locale.t			See if locale support works
-lib/locale/latin1		Part of locale.t in Latin 1
-lib/locale/utf8			Part of locale.t in UTF8
 lib/look.pl			A "look" equivalent
 lib/newgetopt.pl		A perl library supporting long option parsing
 lib/open.pm			Pragma to specify default I/O disciplines
@@ -1233,9 +1231,6 @@ lib/sigtrap.pm			For trapping an abort and giving traceback
 lib/stat.pl			Perl library supporting stat function
 lib/strict.pm			For "use strict"
 lib/strict.t			See if strictures work
-lib/strict/refs			Tests of "use strict 'refs'" for strict.t
-lib/strict/subs			Tests of "use strict 'subs'" for strict.t
-lib/strict/vars			Tests of "use strict 'vars'" for strict.t
 lib/subs.pm			Declare overriding subs
 lib/subs.t			See if subroutine pseudo-importation works
 lib/syslog.pl			Perl library supporting syslogging
@@ -1531,41 +1526,8 @@ lib/validate.pl			Perl library supporting wholesale file mode validation
 lib/vars.pm			Declare pseudo-imported global variables
 lib/vars.t			See if "use vars" work
 lib/warnings.pm			For "use warnings"
-lib/warnings.t		See if warning controls work
-lib/warnings/1global		Tests of global warnings for warnings.t
-lib/warnings/2use		Tests for "use warnings" for warnings.t
-lib/warnings/3both		Tests for interaction of $^W and "use warnings"
-lib/warnings/4lint		Tests for -W switch
-lib/warnings/5nolint		Tests for -X switch
-lib/warnings/6default		Tests default warnings
-lib/warnings/7fatal		Tests fatal warnings
-lib/warnings/8signal		Tests warnings + __WARN__ and __DIE__
-lib/warnings/9enabled		Tests warnings
-lib/warnings/av			Tests for av.c for warnings.t
-lib/warnings/doio		Tests for doio.c for warnings.t
-lib/warnings/doop		Tests for doop.c for warnings.t
-lib/warnings/gv			Tests for gv.c for warnings.t
-lib/warnings/hv			Tests for hv.c for warnings.t
-lib/warnings/malloc		Tests for malloc.c for warnings.t
-lib/warnings/mg			Tests for mg.c for warnings.t
-lib/warnings/op			Tests for op.c for warnings.t
-lib/warnings/perl		Tests for perl.c for warnings.t
-lib/warnings/perlio		Tests for perlio.c for warnings.t
-lib/warnings/perly		Tests for perly.y for warnings.t
-lib/warnings/pp			Tests for pp.c for warnings.t
-lib/warnings/pp_ctl		Tests for pp_ctl.c for warnings.t
-lib/warnings/pp_hot		Tests for pp_hot.c for warnings.t
-lib/warnings/pp_sys		Tests for pp_sys.c for warnings.t
-lib/warnings/regcomp		Tests for regcomp.c for warnings.t
-lib/warnings/regexec		Tests for regexec.c for warnings.t
+lib/warnings.t			See if warning controls work
 lib/warnings/register.pm	For "use warnings::register"
-lib/warnings/run		Tests for run.c for warnings.t
-lib/warnings/sv			Tests for sv.c for warnings.t
-lib/warnings/taint		Tests for taint.c for warnings.t
-lib/warnings/toke		Tests for toke.c for warnings.t
-lib/warnings/universal		Tests for universal.c for warnings.t
-lib/warnings/utf8		Tests for utf8.c for warnings.t
-lib/warnings/util		Tests for util.c for warnings.t
 locale.c			locale-specific utility functions
 makeaperl.SH			perl script that produces a new perl binary
 makedef.pl			Create symbol export lists for linking
@@ -1860,6 +1822,8 @@ t/lib/dprof/test6_v		Perl code profiler tests
 t/lib/filter-util.pl		See if Filter::Util::Call works
 t/lib/h2ph.h			Test header file for h2ph
 t/lib/h2ph.pht			Generated output from h2ph.h by h2ph, for comparison
+t/lib/locale/latin1		Part of locale.t in Latin 1
+t/lib/locale/utf8		Part of locale.t in UTF8
 t/lib/sample-tests/bailout		Test data for Test::Harness
 t/lib/sample-tests/combined		Test data for Test::Harness
 t/lib/sample-tests/descriptive		Test data for Test::Harness
@@ -1873,6 +1837,42 @@ t/lib/sample-tests/skip_all		Test data for Test::Harness
 t/lib/sample-tests/todo			Test data for Test::Harness
 t/lib/sample-tests/with_comments	Test data for Test::Harness
 t/lib/st-dump.pl		See if Storable works
+t/lib/strict/refs		Tests of "use strict 'refs'" for strict.t
+t/lib/strict/subs		Tests of "use strict 'subs'" for strict.t
+t/lib/strict/vars		Tests of "use strict 'vars'" for strict.t
+t/lib/warnings/1global		Tests of global warnings for warnings.t
+t/lib/warnings/2use		Tests for "use warnings" for warnings.t
+t/lib/warnings/3both		Tests for interaction of $^W and "use warnings"
+t/lib/warnings/4lint		Tests for -W switch
+t/lib/warnings/5nolint		Tests for -X switch
+t/lib/warnings/6default		Tests default warnings
+t/lib/warnings/7fatal		Tests fatal warnings
+t/lib/warnings/8signal		Tests warnings + __WARN__ and __DIE__
+t/lib/warnings/9enabled		Tests warnings
+t/lib/warnings/av		Tests for av.c for warnings.t
+t/lib/warnings/doio		Tests for doio.c for warnings.t
+t/lib/warnings/doop		Tests for doop.c for warnings.t
+t/lib/warnings/gv		Tests for gv.c for warnings.t
+t/lib/warnings/hv		Tests for hv.c for warnings.t
+t/lib/warnings/malloc		Tests for malloc.c for warnings.t
+t/lib/warnings/mg		Tests for mg.c for warnings.t
+t/lib/warnings/op		Tests for op.c for warnings.t
+t/lib/warnings/perl		Tests for perl.c for warnings.t
+t/lib/warnings/perlio		Tests for perlio.c for warnings.t
+t/lib/warnings/perly		Tests for perly.y for warnings.t
+t/lib/warnings/pp		Tests for pp.c for warnings.t
+t/lib/warnings/pp_ctl		Tests for pp_ctl.c for warnings.t
+t/lib/warnings/pp_hot		Tests for pp_hot.c for warnings.t
+t/lib/warnings/pp_sys		Tests for pp_sys.c for warnings.t
+t/lib/warnings/regcomp		Tests for regcomp.c for warnings.t
+t/lib/warnings/regexec		Tests for regexec.c for warnings.t
+t/lib/warnings/run		Tests for run.c for warnings.t
+t/lib/warnings/sv		Tests for sv.c for warnings.t
+t/lib/warnings/taint		Tests for taint.c for warnings.t
+t/lib/warnings/toke		Tests for toke.c for warnings.t
+t/lib/warnings/universal	Tests for universal.c for warnings.t
+t/lib/warnings/utf8		Tests for utf8.c for warnings.t
+t/lib/warnings/util		Tests for util.c for warnings.t
 t/op/64bitint.t			See if 64 bit integers work
 t/op/anonsub.t			See if anonymous subroutines work
 t/op/append.t			See if . works
diff --git a/installperl b/installperl
index e681eae..2774553 100755
--- a/installperl
+++ b/installperl
@@ -697,9 +697,6 @@ sub installlib {
     # .exists files, .PL files, and .t files.
     return if $name =~ m{\.orig$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.t$};
 
-    # ignore locale, strict, and warnings test data files
-    return if $name =~ m{^lib/(locale|strict|warnings)/\w+$};
-
     $name = "$dir/$name" if $dir ne '';
 
     my $installlib = $installprivlib;
diff --git a/lib/locale.t b/lib/locale.t
index 19fba59..b18ff41 100644
--- a/lib/locale.t
+++ b/lib/locale.t
@@ -311,9 +311,9 @@ if ($^O eq 'os390') {
 sub in_utf8 () { $^H & 0x08 }
 
 if (in_utf8) {
-    require "locale/utf8";
+    require "lib/locale/utf8";
 } else {
-    require "locale/latin1";
+    require "lib/locale/latin1";
 }
 
 my @Locale;
diff --git a/lib/strict.t b/lib/strict.t
index 8b9083f..6067ad3 100644
--- a/lib/strict.t
+++ b/lib/strict.t
@@ -18,7 +18,7 @@ END { if ($tmpfile) { 1 while unlink $tmpfile; } }
 
 my @prgs = () ;
 
-foreach (sort glob($^O eq 'MacOS' ? ":pragma:strict-*" : "pragma/strict-*")) {
+foreach (sort glob($^O eq 'MacOS' ? ":lib::strict:*" : "lib/strict/*")) {
 
     next if /(~|\.orig|,v)$/;
 
diff --git a/lib/locale/latin1 b/t/lib/locale/latin1
similarity index 100%
rename from lib/locale/latin1
rename to t/lib/locale/latin1
diff --git a/lib/locale/utf8 b/t/lib/locale/utf8
similarity index 100%
rename from lib/locale/utf8
rename to t/lib/locale/utf8
diff --git a/lib/strict/refs b/t/lib/strict/refs
similarity index 100%
rename from lib/strict/refs
rename to t/lib/strict/refs
diff --git a/lib/strict/subs b/t/lib/strict/subs
similarity index 100%
rename from lib/strict/subs
rename to t/lib/strict/subs
diff --git a/lib/strict/vars b/t/lib/strict/vars
similarity index 100%
rename from lib/strict/vars
rename to t/lib/strict/vars
diff --git a/lib/warnings/1global b/t/lib/warnings/1global
similarity index 100%
rename from lib/warnings/1global
rename to t/lib/warnings/1global
diff --git a/lib/warnings/2use b/t/lib/warnings/2use
similarity index 100%
rename from lib/warnings/2use
rename to t/lib/warnings/2use
diff --git a/lib/warnings/3both b/t/lib/warnings/3both
similarity index 100%
rename from lib/warnings/3both
rename to t/lib/warnings/3both
diff --git a/lib/warnings/4lint b/t/lib/warnings/4lint
similarity index 100%
rename from lib/warnings/4lint
rename to t/lib/warnings/4lint
diff --git a/lib/warnings/5nolint b/t/lib/warnings/5nolint
similarity index 100%
rename from lib/warnings/5nolint
rename to t/lib/warnings/5nolint
diff --git a/lib/warnings/6default b/t/lib/warnings/6default
similarity index 100%
rename from lib/warnings/6default
rename to t/lib/warnings/6default
diff --git a/lib/warnings/7fatal b/t/lib/warnings/7fatal
similarity index 100%
rename from lib/warnings/7fatal
rename to t/lib/warnings/7fatal
diff --git a/lib/warnings/8signal b/t/lib/warnings/8signal
similarity index 100%
rename from lib/warnings/8signal
rename to t/lib/warnings/8signal
diff --git a/lib/warnings/9enabled b/t/lib/warnings/9enabled
similarity index 100%
rename from lib/warnings/9enabled
rename to t/lib/warnings/9enabled
diff --git a/lib/warnings/av b/t/lib/warnings/av
similarity index 100%
rename from lib/warnings/av
rename to t/lib/warnings/av
diff --git a/lib/warnings/doio b/t/lib/warnings/doio
similarity index 100%
rename from lib/warnings/doio
rename to t/lib/warnings/doio
diff --git a/lib/warnings/doop b/t/lib/warnings/doop
similarity index 100%
rename from lib/warnings/doop
rename to t/lib/warnings/doop
diff --git a/lib/warnings/gv b/t/lib/warnings/gv
similarity index 100%
rename from lib/warnings/gv
rename to t/lib/warnings/gv
diff --git a/lib/warnings/hv b/t/lib/warnings/hv
similarity index 100%
rename from lib/warnings/hv
rename to t/lib/warnings/hv
diff --git a/lib/warnings/malloc b/t/lib/warnings/malloc
similarity index 100%
rename from lib/warnings/malloc
rename to t/lib/warnings/malloc
diff --git a/lib/warnings/mg b/t/lib/warnings/mg
similarity index 100%
rename from lib/warnings/mg
rename to t/lib/warnings/mg
diff --git a/lib/warnings/op b/t/lib/warnings/op
similarity index 100%
rename from lib/warnings/op
rename to t/lib/warnings/op
diff --git a/lib/warnings/perl b/t/lib/warnings/perl
similarity index 100%
rename from lib/warnings/perl
rename to t/lib/warnings/perl
diff --git a/lib/warnings/perlio b/t/lib/warnings/perlio
similarity index 100%
rename from lib/warnings/perlio
rename to t/lib/warnings/perlio
diff --git a/lib/warnings/perly b/t/lib/warnings/perly
similarity index 100%
rename from lib/warnings/perly
rename to t/lib/warnings/perly
diff --git a/lib/warnings/pp b/t/lib/warnings/pp
similarity index 100%
rename from lib/warnings/pp
rename to t/lib/warnings/pp
diff --git a/lib/warnings/pp_ctl b/t/lib/warnings/pp_ctl
similarity index 100%
rename from lib/warnings/pp_ctl
rename to t/lib/warnings/pp_ctl
diff --git a/lib/warnings/pp_hot b/t/lib/warnings/pp_hot
similarity index 100%
rename from lib/warnings/pp_hot
rename to t/lib/warnings/pp_hot
diff --git a/lib/warnings/pp_sys b/t/lib/warnings/pp_sys
similarity index 100%
rename from lib/warnings/pp_sys
rename to t/lib/warnings/pp_sys
diff --git a/lib/warnings/regcomp b/t/lib/warnings/regcomp
similarity index 100%
rename from lib/warnings/regcomp
rename to t/lib/warnings/regcomp
diff --git a/lib/warnings/regexec b/t/lib/warnings/regexec
similarity index 100%
rename from lib/warnings/regexec
rename to t/lib/warnings/regexec
diff --git a/lib/warnings/run b/t/lib/warnings/run
similarity index 100%
rename from lib/warnings/run
rename to t/lib/warnings/run
diff --git a/lib/warnings/sv b/t/lib/warnings/sv
similarity index 100%
rename from lib/warnings/sv
rename to t/lib/warnings/sv
diff --git a/lib/warnings/taint b/t/lib/warnings/taint
similarity index 100%
rename from lib/warnings/taint
rename to t/lib/warnings/taint
diff --git a/lib/warnings/toke b/t/lib/warnings/toke
similarity index 100%
rename from lib/warnings/toke
rename to t/lib/warnings/toke
diff --git a/lib/warnings/universal b/t/lib/warnings/universal
similarity index 100%
rename from lib/warnings/universal
rename to t/lib/warnings/universal
diff --git a/lib/warnings/utf8 b/t/lib/warnings/utf8
similarity index 100%
rename from lib/warnings/utf8
rename to t/lib/warnings/utf8
diff --git a/lib/warnings/util b/t/lib/warnings/util
similarity index 100%
rename from lib/warnings/util
rename to t/lib/warnings/util