globale Variablen in ein Helfermodul ausgelagert

diff --git a/t/001compile.t b/t/001compile.t
index 6b814abfc6a9527d2ec3e166b654920b5d92b1b6..5289a2d2820ba65b9b1125cc193773b294331b92 100644 (file)
--- a/t/001compile.t
+++ b/t/001compile.t
@@ -74,10 +74,7 @@ foreach my $file (@testitems) {
     if (-l $file) {
         ok(1, "$file is a symlink");
     } else {
     if (-l $file) {
         ok(1, "$file is a symlink");
     } else {

-        local $TODO;
-        $TODO = 'schema updates are not required to be strict now' if $file =~ m{^sql/Pg-upgrade2};
-
-        my $command = "$perlapp -c$T -I modules/fallback -I modules/override $file 2>&1";
+        my $command = "$perlapp -w -c$T -Imodules/fallback -Imodules/override -It -MSupport::CanonialGlobals $file 2>&1";

         my $loginfo=`$command`;
 
         if ($loginfo =~ /syntax ok$/im) {
         my $loginfo=`$command`;
 
         if ($loginfo =~ /syntax ok$/im) {

diff --git a/t/Support/CanonialGlobals.pm b/t/Support/CanonialGlobals.pm
new file mode 100644 (file)
index 0000000..0dec37f
--- /dev/null
+++ b/t/Support/CanonialGlobals.pm
@@ -0,0 +1,17 @@
+package Support::CanonialGlobals;
+
+my @globals = qw(
+  $::lxdebug
+  $::auth
+  %::myconfig
+  $::form
+  %::lx_office_conf
+  $::locale
+  $::dispatcher
+  $::instance_conf
+  %::request
+);
+
+sub import {
+  eval "$_" for @globals;
+}

diff --git a/t/structure/globals.t b/t/structure/globals.t
index 0a04c6f6f4a3449aa61662d89e70c434574cfc51..dca7369d54288a652420f7bd21922fddbcdac4c6 100644 (file)
--- a/t/structure/globals.t
+++ b/t/structure/globals.t
@@ -3,11 +3,12 @@
 use strict;
 use lib 't';
 use Support::Files;
 use strict;
 use lib 't';
 use Support::Files;

+use Support::CanonialGlobals ();

 
 my (@globals, $testcount);
 
 BEGIN {
 
 my (@globals, $testcount);
 
 BEGIN {

-  @globals = qw(lxdebug auth myconfig form lx_office_conf locale dispatcher instance_conf request);
+  @globals = map { s/[^a-z_]//; $_ } @Support::CanonialGlobals::globals;

   $testcount = scalar(@Support::Files::testitems);
 }
 
   $testcount = scalar(@Support::Files::testitems);
 }