From 07812306298695b7760554f23dbac8ba799f8288 Mon Sep 17 00:00:00 2001 From: Debian Qt/KDE Maintainers Date: Sun, 2 Jun 2024 16:40:32 +0300 Subject: [PATCH] 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 --- tests/auto/blackbox/testdata/linkerMode/darwin.s | 6 ++++++ tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs | 2 +- tests/auto/blackbox/testdata/linkerMode/main.s | 1 - 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 tests/auto/blackbox/testdata/linkerMode/darwin.s 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 -- 2.30.2