1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed qtmodule-configtests on Windows

Browse Source 
open to "|-" and "-|" are unsupported on Windows (see `perldoc
perlport'), so don't do that.

Rather than parsing the output of make to decide if a config test is
skipped, use a looser definition: it is skipped if qmake and make both
succeed, but no binary is created.

Change-Id: Idab7266888e9c934aa7b5c1c6ac5930439681107
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Friedemann Kleint 2012-01-12 16:03:33 +01:00 committed by Qt by Nokia
parent eb8fce6e56
commit f865dc1ae4
1 changed files with 53 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
bin/qtmodule-configtests
View File

@ -76,7 +76,9 @@ my $generator = $ARGV[3];
our %configtests; our %configtests;
my $qmakeCachePath = catfile($out_basedir, ".qmake.cache"); my $absOutDir = abs_path($out_basedir);
my $qmakeCachePath = catfile($absOutDir, '.qmake.cache');
my $configLogPath = catfile($absOutDir, 'config.log');
my $QMAKE = catfile($qtbasedir, "bin", ($^O =~ /win32/i) ? 'qmake.exe' : 'qmake'); my $QMAKE = catfile($qtbasedir, "bin", ($^O =~ /win32/i) ? 'qmake.exe' : 'qmake');
if (!-x $QMAKE) { if (!-x $QMAKE) {
@ -162,36 +164,36 @@ sub hashesAreDifferent {
} }
} }
###################################################################### ######################################################################
# Syntax: executeSomething # Syntax: executeLoggedCommand()
# Params: A list of things. # Params: path to executable, arguments
# #
# Purpose: Executes the first arg, passing the list. # This function is equivalent to system(), except that the command
# stderr is redirected to stdout, and the output is captured. # details and output is placed in the configure log (only).
# Returns: The output. #
# Purpose: run a command and log the output
# Returns: exit status (as returned by system())
###################################################################### ######################################################################
sub executeSomething { sub executeLoggedCommand {
my ($program, @args) = @_; my (@command_with_args) = @_;
my $pid = open(KID_TO_READ, "-|"); # Redirect all stdout, stderr into the config.log
my ($save_stdout, $save_stderr);
open($save_stdout, '>&', STDOUT) || die "save STDOUT: $!";
open($save_stderr, '>&', STDERR) || die "save STDERR: $!";
open(STDOUT, '>>', $configLogPath) || die "open $configLogPath: $!";
open(STDERR, '>&', STDOUT) || die "redirect STDERR to STDOUT: $!";
my $output;
if ($pid) { # parent print "+ @command_with_args\n";
while (<KID_TO_READ>) { my $out = system(@command_with_args);
$output = $output . $_;
}
close(KID_TO_READ) || $! == 0 || warn "\nFailed to execute $program: exited $?";
} else {
# redirect STDERR to STDOUT
open STDERR, ">&STDOUT";
# Exec something # Put them back.
exec ($program, @args) || die "\nCan't exec $program: $!\n"; open(STDOUT, '>&', $save_stdout) || die "restoring STDOUT: $!";
# NOTREACHED open(STDERR, '>&', $save_stderr) || die "restoring STDERR: $!";
}
return $output; return $out;
} }
###################################################################### ######################################################################
@ -211,12 +213,18 @@ sub executeSomething {
sub executeTest { sub executeTest {
my ($testName) = @_; my ($testName) = @_;
{
my $fh;
open($fh, '>>', $configLogPath) || die "open $configLogPath: $!";
print $fh "executing config test $testName:\n";
}
my $oldWorkingDir = getcwd(); my $oldWorkingDir = getcwd();
my $ret = 0; my $ret;
my @QMAKEARGS = ('CONFIG-=debug_and_release', 'CONFIG-=app_bundle'); my @QMAKEARGS = ('CONFIG-=debug_and_release', 'CONFIG-=app_bundle');
my $testOutDir = catdir($out_basedir, 'config.tests', $testName); my $testOutDir = abs_path(catdir($out_basedir, 'config.tests', $testName));
# Since we might be cross compiling, look for barename (Linux) and .exe (Win32/Symbian) # Since we might be cross compiling, look for barename (Linux) and .exe (Win32/Symbian)
my $testOutFile1 = catfile($testOutDir, "$testName.exe"); my $testOutFile1 = catfile($testOutDir, "$testName.exe");
@ -236,26 +244,31 @@ sub executeTest {
# First remove existing stuff (XXX this probably needs generator specific code, but hopefully # First remove existing stuff (XXX this probably needs generator specific code, but hopefully
# the target removal below will suffice) # the target removal below will suffice)
if (-e "Makefile") { if (-e "Makefile") {
executeSomething($MAKE, 'distclean'); executeLoggedCommand($MAKE, 'distclean');
} }
# and any targets that we might find that weren't distcleaned # and any targets that we might find that weren't distcleaned
unlink $testOutFile1, $testOutFile2; unlink $testOutFile1, $testOutFile2;
# Run qmake && make # Run qmake && make
executeSomething($QMAKE, @QMAKEARGS); if (executeLoggedCommand($QMAKE, @QMAKEARGS)) {
my $makeOutput = executeSomething(($MAKE)); # qmake failed -> config test failed
$ret = 0;
# If make prints "blah blah blah\nSkipped." we consider this a skipped test } elsif (executeLoggedCommand($MAKE)) {
if ($makeOutput !~ qr(^Skipped\.$)ms) { # make failed -> config test failed
# Check the test exists (can't reliably execute, especially for cross compilation) $ret = 0;
if (-e $testOutFile1 or -e $testOutFile2) { } elsif (-e $testOutFile1 or -e $testOutFile2) {
$ret = 1; # qmake, make passed, output file exists -> success
} $ret = 1;
} else { } else {
# qmake, make passed, output file doesn't exist -> skipped
$ret = 2; $ret = 2;
} }
my $fh;
open($fh, '>>', $configLogPath) || die "open $configLogPath: $!";
print $fh "config test $testName completed with result $ret\n";
chdir $oldWorkingDir or die "\nUnable to restore working directory: $!\n"; chdir $oldWorkingDir or die "\nUnable to restore working directory: $!\n";
return $ret; return $ret;
} }
@ -297,6 +310,11 @@ if (abs_path($out_basedir) ne abs_path($qtbasedir)) {
# Turn off buffering # Turn off buffering
$| = 1; $| = 1;
# Remove existing config.log
if (-e $configLogPath) {
unlink($configLogPath) || die "unlink $configLogPath: $!";
}
# Now run the configuration tests # Now run the configuration tests
print "Configuration tests:\n" if (%configtests); print "Configuration tests:\n" if (%configtests);