From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Sat, 8 Jun 2024 18:54:49 +0000 (+0300)
Subject: fix the linkerMode test for Linux ARM
X-Git-Tag: archive/raspbian/2.3.1-4+rpi1~1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=94f962eaf4e40e904ee80587d1caad2149e0a4d9;p=qbs.git

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
index 00000000..fb165114
--- /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 9934efb0..176730ce 100644
--- 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 fb165114..ef88f8c5 100644
--- a/tests/auto/blackbox/testdata/linkerMode/main.s
+++ b/tests/auto/blackbox/testdata/linkerMode/main.s
@@ -3,4 +3,3 @@
 
 _main:
 main:
-    ret