Merge remote-tracking branch 'origin/1.1'

Change-Id: I597280483f7477856152f434249d8ee830d5ea40

7 files changed, 49 insertions, 0 deletions

diff --git a/tests/auto/blackbox/testdata/assembly/assembly.qbs b/tests/auto/blackbox/testdata/assembly/assembly.qbs
new file mode 100644
index 000000000..344e65cd1
--- /dev/null
+++ b/tests/auto/blackbox/testdata/assembly/assembly.qbs
@@ -0,0 +1,23 @@
+import qbs 1.0
+
+Project {
+   StaticLibrary {
+      name : "testa"
+      files : [ "testa.s" ]
+      Depends { name: "cpp" }
+      condition: qbs.toolchain.contains("gcc")
+   }
+   StaticLibrary {
+      name : "testb"
+      files : [ "testb.S" ]
+      Depends { name: "cpp" }
+      condition: qbs.toolchain.contains("gcc")
+   }
+   StaticLibrary {
+      name : "testc"
+      files : [ "testc.sx" ]
+      Depends { name: "cpp" }
+      condition: qbs.toolchain.contains("gcc")
+   }
+}
+
diff --git a/tests/auto/blackbox/testdata/assembly/testa.s b/tests/auto/blackbox/testdata/assembly/testa.s
new file mode 100644
index 000000000..39e402ae0
--- /dev/null
+++ b/tests/auto/blackbox/testdata/assembly/testa.s
@@ -0,0 +1,3 @@
+.globl symbola
+symbola:
+    nop
diff --git a/tests/auto/blackbox/testdata/assembly/testb.S b/tests/auto/blackbox/testdata/assembly/testb.S
new file mode 100644
index 000000000..845be5502
--- /dev/null
+++ b/tests/auto/blackbox/testdata/assembly/testb.S
@@ -0,0 +1,3 @@
+#define bla nop
+symbolb:
+    bla
diff --git a/tests/auto/blackbox/testdata/assembly/testc.sx b/tests/auto/blackbox/testdata/assembly/testc.sx
new file mode 100644
index 000000000..845be5502
--- /dev/null
+++ b/tests/auto/blackbox/testdata/assembly/testc.sx
@@ -0,0 +1,3 @@
+#define bla nop
+symbolb:
+    bla
diff --git a/tests/auto/blackbox/testdata/fileTagger/moc_cpp.qbs b/tests/auto/blackbox/testdata/fileTagger/moc_cpp.qbs
index 681a93f28..b56412bed 100644
--- a/tests/auto/blackbox/testdata/fileTagger/moc_cpp.qbs
+++ b/tests/auto/blackbox/testdata/fileTagger/moc_cpp.qbs
@@ -28,6 +28,7 @@ Project {
             cmd.sourceCode = function () {
                 var file = new TextFile(input.fileName, TextFile.ReadOnly);
                 var text = file.readAll();
+                file.close();
                 file = new TextFile(output.fileName, TextFile.WriteOnly);
                 file.truncate();
                 file.write(text);
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 116da31fa..30b62dc41 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -1476,4 +1476,19 @@ void TestBlackbox::missingProfile()
     QVERIFY(m_qbsStderr.contains("No profile"));
 }
 
+void TestBlackbox::testAssembly()
+{
+    SettingsPtr settings = qbsSettings();
+    Profile profile(buildProfileName, settings.data());
+    bool haveGcc = profile.value("qbs.toolchain").toString().contains("gcc");
+    QDir::setCurrent(testDataDir + "/assembly");
+    QVERIFY(runQbs() == 0);
+    QCOMPARE((bool)m_qbsStdout.contains("compiling testa.s"), haveGcc);
+    QCOMPARE((bool)m_qbsStdout.contains("compiling testb.S"), haveGcc);
+    QCOMPARE((bool)m_qbsStdout.contains("compiling testc.sx"), haveGcc);
+    QCOMPARE((bool)m_qbsStdout.contains("creating libtesta.a"), haveGcc);
+    QCOMPARE((bool)m_qbsStdout.contains("creating libtestb.a"), haveGcc);
+    QCOMPARE((bool)m_qbsStdout.contains("creating libtestc.a"), haveGcc);
+}
+
 QTEST_MAIN(TestBlackbox)
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index f86e7617c..24e8dce5d 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -152,6 +152,7 @@ private slots:
     void toolLookup();
     void checkProjectFilePath();
     void missingProfile();
+    void testAssembly();
 
 private:
     QByteArray m_qbsStderr;