diff options
Diffstat (limited to 'bin/qtmodule-configtests')
-rwxr-xr-x | bin/qtmodule-configtests | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/bin/qtmodule-configtests b/bin/qtmodule-configtests index 412f57ff8a..965a3e556b 100755 --- a/bin/qtmodule-configtests +++ b/bin/qtmodule-configtests @@ -268,17 +268,19 @@ sub executeTest { unlink $testOutFile1, $testOutFile2; # Run qmake && make - executeLoggedCommand($QMAKE, @QMAKEARGS); - my ($makeExitCode, $makeOutput) = executeLoggedCommand($MAKE); - - # If make prints "blah blah blah\nSkipped." we consider this a skipped test - if ($makeOutput !~ qr(^Skipped\.$)ms) { - # Check the test exists (can't reliably execute, especially for cross compilation) - if (-e $testOutFile1 or -e $testOutFile2) { - $ret = 1; + my ($qmakeExitCode, $qmakeOutput) = executeLoggedCommand($QMAKE, @QMAKEARGS); + if ($qmakeExitCode == 0) { + my ($makeExitCode, $makeOutput) = executeLoggedCommand($MAKE); + + # If make prints "blah blah blah\nSkipped." we consider this a skipped test + if ($makeOutput !~ qr(^Skipped\.$)ms) { + # Check the test exists (can't reliably execute, especially for cross compilation) + if ($makeExitCode == 0 and (-e $testOutFile1 or -e $testOutFile2)) { + $ret = 1; + } + } else { + $ret = 2; } - } else { - $ret = 2; } my $fh; |