5 files changed, 28 insertions, 28 deletions

diff --git a/share/qbs/imports/qbs/ModUtils/utils.js b/share/qbs/imports/qbs/ModUtils/utils.js
index 84d62a556..5c1fb1ae5 100644
--- a/share/qbs/imports/qbs/ModUtils/utils.js
+++ b/share/qbs/imports/qbs/ModUtils/utils.js
@@ -566,6 +566,8 @@ function guessArchitecture(m) {
             architecture = "avr";
         } else if (hasAnyOf(m, ["__AVR32__"])) {
             architecture = "avr32";
+        } else if (hasAnyOf(m, ["__MSP430__"])) {
+            architecture = "msp430";
         }
     }
 
diff --git a/share/qbs/imports/qbs/Probes/IarProbe.qbs b/share/qbs/imports/qbs/Probes/IarProbe.qbs
index 6e7fb7d64..d261e9065 100644
--- a/share/qbs/imports/qbs/Probes/IarProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/IarProbe.qbs
@@ -65,34 +65,25 @@ PathProbe {
                 compilerFilePath, tag);
         }
 
-        // FIXME: Do we need dump the default paths for both C
-        // and C++ languages?
-        var defaultPaths = IAR.dumpDefaultPaths(
-            compilerFilePath, languages[0]);
-
         var macros = compilerDefinesByLanguage["c"]
             || compilerDefinesByLanguage["cpp"];
 
         architecture = IAR.guessArchitecture(macros);
         endianness = IAR.guessEndianness(macros);
-        includePaths = defaultPaths.includePaths;
 
-        var version = parseInt(macros["__VER__"], 10);
+        // FIXME: Do we need dump the default paths for both C
+        // and C++ languages?
+        var defaultPaths = IAR.dumpDefaultPaths(
+            compilerFilePath, languages[0]);
 
-        if (architecture === "arm") {
-            versionMajor = parseInt(version / 1000000);
-            versionMinor = parseInt(version / 1000) % 1000;
-            versionPatch = parseInt(version) % 1000;
-        } else if (architecture === "mcs51") {
-            versionMajor = parseInt(version / 100);
-            versionMinor = parseInt(version % 100);
-            versionPatch = 0;
-        } else if (architecture === "avr") {
-            versionMajor = parseInt(version / 100);
-            versionMinor = parseInt(version % 100);
-            versionPatch = 0;
-        }
+        includePaths = defaultPaths.includePaths;
 
-        found = version && architecture && endianness;
+        var version = IAR.guessVersion(macros, architecture);
+        if (version) {
+            versionMajor = version.major;
+            versionMinor = version.minor;
+            versionPatch = version.patch;
+            found = version && architecture && endianness;
+        }
    }
 }
diff --git a/share/qbs/imports/qbs/Probes/KeilProbe.qbs b/share/qbs/imports/qbs/Probes/KeilProbe.qbs
index 1955fe480..34afecb64 100644
--- a/share/qbs/imports/qbs/Probes/KeilProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/KeilProbe.qbs
@@ -81,8 +81,7 @@ PathProbe {
             versionMajor = version.major;
             versionMinor = version.minor;
             versionPatch = version.patch;
+            found = version.found  && architecture && endianness;
         }
-
-        found = version.found  && architecture && endianness;
     }
 }
diff --git a/share/qbs/imports/qbs/Probes/SdccProbe.qbs b/share/qbs/imports/qbs/Probes/SdccProbe.qbs
index b5f7d384e..3595bb158 100644
--- a/share/qbs/imports/qbs/Probes/SdccProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/SdccProbe.qbs
@@ -64,10 +64,10 @@ PathProbe {
         var defaultPaths = SDCC.dumpDefaultPaths(compilerFilePath, architecture);
         includePaths = defaultPaths.includePaths;
 
-        versionMajor = parseInt(macros["__SDCC_VERSION_MAJOR"], 10);
-        versionMinor = parseInt(macros["__SDCC_VERSION_MINOR"], 10);
-        versionPatch = parseInt(macros["__SDCC_VERSION_PATCH"], 10);
-
-        found = macros["SDCC"];
+        var version = SDCC.guessVersion(macros);
+        versionMajor = version.major;
+        versionMinor = version.minor;
+        versionPatch = version.patch;
+        found = version.found;
    }
 }
diff --git a/share/qbs/imports/qbs/base/AutotestRunner.qbs b/share/qbs/imports/qbs/base/AutotestRunner.qbs
index ab9ba15f7..62ba7740b 100644
--- a/share/qbs/imports/qbs/base/AutotestRunner.qbs
+++ b/share/qbs/imports/qbs/base/AutotestRunner.qbs
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2019 Jochen Ulrich <jochenulrich@t-online.de>
 ** Contact: http://www.qt.io/licensing
 **
 ** This file is part of Qbs.
@@ -42,6 +43,7 @@ Product {
     property stringList wrapper: []
     property string workingDir
     property stringList auxiliaryInputs
+    property int timeout: -1
 
     Depends {
         productTypes: "autotest"
@@ -74,6 +76,7 @@ Product {
                                                 : FileInfo.path(commandFilePath);
             var arguments = product.arguments;
             var allowFailure = false;
+            var timeout = product.timeout;
             if (input.autotest) {
                 // FIXME: We'd like to let the user override with an empty list, but
                 //        qbscore turns undefined lists into empty ones at the moment.
@@ -83,6 +86,9 @@ Product {
                 if (input.autotest.workingDir)
                     workingDir = input.autotest.workingDir;
                 allowFailure = input.autotest.allowFailure;
+
+                if (input.autotest.timeout !== undefined)
+                    timeout = input.autotest.timeout;
             }
             var fullCommandLine = product.wrapper
                 .concat([commandFilePath])
@@ -91,6 +97,8 @@ Product {
             cmd.description = "Running test " + input.fileName;
             cmd.environment = product.environment;
             cmd.workingDirectory = workingDir;
+            cmd.timeout = timeout;
+            cmd.jobPool = "autotest-runner";
             if (allowFailure)
                 cmd.maxExitCode = 32767;
             return cmd;