[Tools] testbot/lib: Don't force the build VM to have a ConfigLocal.pm file and a DBI perl module.
Francois Gouget
fgouget at codeweavers.com
Mon Sep 3 17:11:28 CDT 2012
Neither are needed for the build VM.
---
testbot/bin/BuildSingleTest.pl | 1 +
testbot/bin/Reconfig.pl | 1 +
testbot/lib/WineTestBot/Config.pm | 25 ++++++++++++++-----------
3 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/testbot/bin/BuildSingleTest.pl b/testbot/bin/BuildSingleTest.pl
index 8018679..52ff8ba 100755
--- a/testbot/bin/BuildSingleTest.pl
+++ b/testbot/bin/BuildSingleTest.pl
@@ -25,6 +25,7 @@ use strict;
my $Dir;
sub BEGIN
{
+ $main::BuildEnv = 1;
$0 =~ m=^(.*)/[^/]*$=;
$Dir = $1;
}
diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl
index aecc6a3..f72ba6c 100755
--- a/testbot/bin/Reconfig.pl
+++ b/testbot/bin/Reconfig.pl
@@ -25,6 +25,7 @@ use strict;
my $Dir;
sub BEGIN
{
+ $main::BuildEnv = 1;
$0 =~ m=^(.*)/[^/]*$=;
$Dir = $1;
}
diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm
index a29f99c..5a164ea 100644
--- a/testbot/lib/WineTestBot/Config.pm
+++ b/testbot/lib/WineTestBot/Config.pm
@@ -24,8 +24,6 @@ WineTestBot::Config - Site-independent configuration settings
=cut
-use ObjectModel::DBIBackEnd;
-
use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir
$VixHostType $VixHostUsername $VixHostPassword
$VixGuestUsername $VixGuestPassword $DbDataSource $DbUsername
@@ -81,18 +79,23 @@ $LDAPEMailAttribute = undef;
$JobPurgeDays = 7;
$JobArchiveDays = 0;
-eval 'require "WineTestBot/ConfigLocal.pl";';
-if ($@)
+if (!$main::BuildEnv)
{
- print STDERR "Please create a valid lib/WineTestBot/ConfigLocal.pl, use " .
- "lib/WineTestBot/ConfigLocalTemplate.pl as template\n";
- exit;
+ $main::BuildEnv = 0;
+ eval 'require "WineTestBot/ConfigLocal.pl";';
+ if ($@)
+ {
+ print STDERR "Please create a valid lib/WineTestBot/ConfigLocal.pl, " .
+ "use lib/WineTestBot/ConfigLocalTemplate.pl as template\n";
+ exit;
+ }
+
+ require ObjectModel::DBIBackEnd;
+ ObjectModel::DBIBackEnd->UseDBIBackEnd('WineTestBot', $DbDataSource,
+ $DbUsername, $DbPassword,
+ { RaiseError => 1 });
}
-ObjectModel::DBIBackEnd->UseDBIBackEnd('WineTestBot', $DbDataSource,
- $DbUsername, $DbPassword,
- { RaiseError => 1 });
-
umask 002;
1;
--
1.7.10.4
More information about the wine-patches
mailing list