From 1e13160a005f9f33cfeb2f2b602756e6627bef58 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Date: Thu, 8 Mar 2012 05:11:11 -0800
Subject: Fix qtmodule-configtests to honor error codes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Change-Id: I565c68af4a9271d7aa36fb592ac399aa728ba4d8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
---
 bin/qtmodule-configtests | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'bin')

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;
-- 
cgit v1.2.3