fix the linkerMode test for Linux ARM

Origin: upstream, https://code.qt.io/cgit/qbs/qbs.git/commit/?id=03dc3932dacf76d4
Last-Update: 2024-05-11

Gbp-Pq: Name fix_linker_mode_test.diff

diff --git a/tests/auto/blackbox/testdata/linkerMode/darwin.s b/tests/auto/blackbox/testdata/linkerMode/darwin.s
new file mode 100644 (file)
index 0000000..fb16511
--- /dev/null
+++ b/tests/auto/blackbox/testdata/linkerMode/darwin.s
@@ -0,0 +1,6 @@
+.globl _main
+.globl main
+
+_main:
+main:
+    ret

diff --git a/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs b/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs
index 9934efb04b4ffc3e4ece8b8c50c209bbff8aa905..176730ce0217b26ba157b469ef0630d5ac3dbf10 100644 (file)
--- a/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs
+++ b/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs
@@ -2,7 +2,7 @@ Project {
     CppApplication {
         consoleApplication: true
         name: "LinkedProduct-Assembly"
-        files: ["main.s"]
+        files: qbs.targetOS.includes("darwin") ? "darwin.s" : "main.s"
 
         cpp.linkerPath: cpp.compilerPathByLanguage["c"]
 

diff --git a/tests/auto/blackbox/testdata/linkerMode/main.s b/tests/auto/blackbox/testdata/linkerMode/main.s
index fb165114b2857fe2bb969007de7e5bc517e391c6..ef88f8c520935c5d53fdc859e6b0ab6a67ef6b31 100644 (file)
--- a/tests/auto/blackbox/testdata/linkerMode/main.s
+++ b/tests/auto/blackbox/testdata/linkerMode/main.s
@@ -3,4 +3,3 @@
 
 _main:
 main:
-    ret