t/structure/globals: Lexikalische Variablen sind schwer exportierbar.

diff --git a/t/Support/CanonialGlobals.pm b/t/Support/CanonialGlobals.pm
index 0dec37fde53417d44e2092b0586f5ab0d18deea7..656b8889d80bd15462d9e7f275e2c1fa60254e58 100644 (file)
--- a/t/Support/CanonialGlobals.pm
+++ b/t/Support/CanonialGlobals.pm
@@ -1,6 +1,6 @@
 package Support::CanonialGlobals;
 
 package Support::CanonialGlobals;
 

-my @globals = qw(
+our @globals = qw(

   $::lxdebug
   $::auth
   %::myconfig
   $::lxdebug
   $::auth
   %::myconfig

diff --git a/t/structure/globals.t b/t/structure/globals.t
index dca7369d54288a652420f7bd21922fddbcdac4c6..10fd0393e1d644f297225fabd177ee76fd420da4 100644 (file)
--- a/t/structure/globals.t
+++ b/t/structure/globals.t
@@ -8,10 +8,11 @@ use Support::CanonialGlobals ();
 my (@globals, $testcount);
 
 BEGIN {
 my (@globals, $testcount);
 
 BEGIN {

-  @globals = map { s/[^a-z_]//; $_ } @Support::CanonialGlobals::globals;
+  @globals = map { s/[^a-z_]//g; $_ } @Support::CanonialGlobals::globals;

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

+

 use Test::More tests => $testcount;
 
 # Capture the TESTOUT from Test::More or Test::Builder for printing errors.
 use Test::More tests => $testcount;
 
 # Capture the TESTOUT from Test::More or Test::Builder for printing errors.


@@ -53,7 +54,7 @@ foreach my $file (@testitems) {
         if ($found_word) {
             ok(0,"$file: found UNREGISTERED GLOBAL $found_word --WARNING");
         } else {
         if ($found_word) {
             ok(0,"$file: found UNREGISTERED GLOBAL $found_word --WARNING");
         } else {

-            ok(1,"$file does only contain registered globals");
+            ok(1,$file);

         }
     } else {
         ok(0,"could not open $file for globals check --WARNING");
         }
     } else {
         ok(0,"could not open $file for globals check --WARNING");