diff --git a/docs/upgrades/upgrade_6.8.7-6.99.0.pl b/docs/upgrades/upgrade_6.8.7-6.99.0.pl index d71a75a31..9ebfac82e 100644 --- a/docs/upgrades/upgrade_6.8.7-6.99.0.pl +++ b/docs/upgrades/upgrade_6.8.7-6.99.0.pl @@ -89,7 +89,7 @@ sub convertMessageLogToInbox { } $session->db->write("delete from userProfileField where fieldname='INBOXNotifications'"); $session->db->write("delete from userProfileData where fieldname='INBOXNotifications'"); - $session->db->write("drop table MessageLog"); + $session->db->write("drop table if exists messageLog"); $rs = $session->db->read("select distinct assetId from template where namespace='Operation/MessageLog/View' or namespace='Operation/MessageLog/Message'"); while (my ($id) = $rs->array) { my $asset = WebGUI::Asset->new($session, $id, "WebGUI::Asset::Template"); diff --git a/t/syntaxCheck.t b/t/syntaxCheck.t index b71a63aad..53c07c1fd 100644 --- a/t/syntaxCheck.t +++ b/t/syntaxCheck.t @@ -20,7 +20,6 @@ use Test::More; plan skip_all => 'set TEST_SYNTAX to enable this test' unless $ENV{TEST_SYNTAX}; my @modules; -my @failed_packages; my $wgLib = WebGUI::Test->lib; diag("Checking modules in $wgLib"); File::Find::find( \&getWebGUIModules, $wgLib); @@ -32,17 +31,9 @@ plan tests => $numTests; diag("Planning on $numTests tests"); foreach my $package (@modules) { - my $returnVal = system("$^X -I$wgLib -wc $package"); - is($returnVal, 0, "syntax check for $package"); - push(@failed_packages, $package) if ($returnVal != 0); -} - -if (@failed_packages) { - print "\n# Compilation FAILED for the following packages:\n"; - foreach my $package (@failed_packages) { - print "# - $package\n"; - } - print "\n" + my $command = "$^X -I$wgLib -wc $package 2>&1"; + my $output = `$command`; + is($?, 0, "syntax check for $package"); } #----------------------------------------