Merge remote-tracking branch 'origin/1.2'

Change-Id: I603430421156e4d23451a7a4ba0f884d6556f89a

1 files changed, 22 insertions, 0 deletions

diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index eb3e01394..5ffb43961 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -1553,6 +1553,28 @@ void TestBlackbox::dynamicRuleOutputs()
     QVERIFY(!QFile::exists(sourceFile2));
 }
 
+void TestBlackbox::erroneousFiles_data()
+{
+    QTest::addColumn<QString>("errorMessage");
+    QTest::newRow("nonexistentWorkingDir")
+            << "The working directory '/does/not/exist' for process 'ls' is invalid.";
+}
+
+void TestBlackbox::erroneousFiles()
+{
+    QFETCH(QString, errorMessage);
+    QDir::setCurrent(testDataDir + "/erroneous/" + QTest::currentDataTag());
+    QbsRunParameters params;
+    params.expectFailure = true;
+    QVERIFY(runQbs(params) != 0);
+    QString err = QString::fromLocal8Bit(m_qbsStderr);
+    if (!err.contains(errorMessage)) {
+        qDebug() << "Output:  " << err;
+        qDebug() << "Expected: " << errorMessage;
+        QFAIL("Unexpected error message.");
+    }
+}
+
 void TestBlackbox::explicitlyDependsOn()
 {
     QDir::setCurrent(testDataDir + "/explicitlyDependsOn");