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

Fix qtmodule-configtests to honor error codes

Browse Source 
The test is marked as fail if qmake or make fails.

Change-Id: I565c68af4a9271d7aa36fb592ac399aa728ba4d8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
This commit is contained in:
Girish Ramakrishnan 2012-03-08 05:11:11 -08:00 committed by Qt by Nokia
parent 824cc94921
commit 1e13160a00
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/qtmodule-configtests
View File

@ -268,18 +268,20 @@ sub executeTest {
unlink $testOutFile1, $testOutFile2; unlink $testOutFile1, $testOutFile2;
# Run qmake && make # Run qmake && make
executeLoggedCommand($QMAKE, @QMAKEARGS); my ($qmakeExitCode, $qmakeOutput) = executeLoggedCommand($QMAKE, @QMAKEARGS);
if ($qmakeExitCode == 0) {
my ($makeExitCode, $makeOutput) = executeLoggedCommand($MAKE); my ($makeExitCode, $makeOutput) = executeLoggedCommand($MAKE);
# If make prints "blah blah blah\nSkipped." we consider this a skipped test # If make prints "blah blah blah\nSkipped." we consider this a skipped test
if ($makeOutput !~ qr(^Skipped\.$)ms) { if ($makeOutput !~ qr(^Skipped\.$)ms) {
# Check the test exists (can't reliably execute, especially for cross compilation) # Check the test exists (can't reliably execute, especially for cross compilation)
if (-e $testOutFile1 or -e $testOutFile2) { if ($makeExitCode == 0 and (-e $testOutFile1 or -e $testOutFile2)) {
$ret = 1; $ret = 1;
} }
} else { } else {
$ret = 2; $ret = 2;
} }
}
my $fh; my $fh;
open($fh, '>>', $configLogPath) || die "open $configLogPath: $!"; open($fh, '>>', $configLogPath) || die "open $configLogPath: $!";