Bug 165756 - Running tests without checksetup causes failure

r=joel, jake

diff --git a/Bug.pm b/Bug.pm
index 3cbb1e765b67c4f1c4ab26927227d46c916e0c5e..7e703d14f8fc16abc431e736d07a7e6c75611447 100755 (executable)
--- a/Bug.pm
+++ b/Bug.pm
@@ -26,8 +26,7 @@ use strict;
 use DBI;
 use RelationSet;
 use vars qw($unconfirmedstate $legal_keywords);
-require "globals.pl";
-require "CGI.pl";
+
 package Bug;
 use CGI::Carp qw(fatalsToBrowser);
 my %ok_field;

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 3cbb1e765b67c4f1c4ab26927227d46c916e0c5e..7e703d14f8fc16abc431e736d07a7e6c75611447 100755 (executable)
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -26,8 +26,7 @@ use strict;
 use DBI;
 use RelationSet;
 use vars qw($unconfirmedstate $legal_keywords);
-require "globals.pl";
-require "CGI.pl";
+
 package Bug;
 use CGI::Carp qw(fatalsToBrowser);
 my %ok_field;

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 46921da28e70e391acace9025501030a62df1f00..fc4ae6213bcca3823787e2a99ed7f00bdb4a0767 100644 (file)
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -27,8 +27,7 @@
 
 use strict;
 
-require "globals.pl";
-require "CGI.pl";
+# The caller MUST require CGI.pl and globals.pl before using this
 
 use vars qw($userid $usergroupset);
 

diff --git a/move.pl b/move.pl
index fe86011fa48cdc07cd62b95f95ffc2a778af2896..1fcf3570712963d6bb45fcccdfc43837059b2af8 100755 (executable)
--- a/move.pl
+++ b/move.pl
@@ -25,8 +25,12 @@ use strict;
 
 use lib qw(.);
 
-use Bug;
 require "CGI.pl";
+
+use vars qw($userid %COOKIE);
+
+use Bug;
+
 $::lockcount = 0;
 
 unless ( Param("move-enabled") ) {

diff --git a/xml.cgi b/xml.cgi
index 16442db0d24ad0db5700963d2cffbeb483bfc1b2..91f8e8c03152e072a45ca2e636c978cc27eea0e7 100755 (executable)
--- a/xml.cgi
+++ b/xml.cgi
@@ -26,10 +26,11 @@ use strict;
 
 use lib qw(.);
 
-use Bug;
 require "CGI.pl";
 
-use vars qw($template $vars);
+use Bug;
+
+use vars qw($template $vars $userid %COOKIE);
 
 ConnectToDatabase();
 quietly_check_login();