1From 09cfcf7de2aab873a13949d5a128ccfb9e54732d Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Mon, 5 May 2025 08:15:37 +0200
4Subject: [PATCH] build_support: use source filename instead of 'foo' for
5 discover tests
6
7* helps when debugging the issues
8* use the same order of CC arguments in compile_and_run and
9  does_build_succeed just for consistency
10* use pthread in both compile_and_run and does_build_succeed functions
11  it was added only to does_build_succeed in 5ec39f7af8cfd8525d225b1302fa93f7133b3849
12  not sure if it was intentional
13
14Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
15Upstream-Status: Submitted [https://github.com/osvenskan/posix_ipc/pull/77]
16---
17 build_support/discover_system_info.py | 6 +++---
18 1 file changed, 3 insertions(+), 3 deletions(-)
19
20diff --git a/build_support/discover_system_info.py b/build_support/discover_system_info.py
21index bc4d174..6d059d9 100644
22--- a/build_support/discover_system_info.py
23+++ b/build_support/discover_system_info.py
24@@ -60,7 +60,7 @@ def does_build_succeed(filename, linker_options=""):
25     #     Rather than testing whether or not it's needed, I just specify it
26     #     everywhere since it's harmless to specify it when it's not needed.
27     cc = os.getenv("CC", "cc")
28-    cmd = "%s -Wall -o ./build_support/src/foo ./build_support/src/%s %s -lpthread" % (cc, filename, linker_options)
29+    cmd = "%s -Wall -o ./build_support/src/%s ./build_support/src/%s %s -lpthread" % (cc, filename[:-2], filename, linker_options)
30
31     p = subprocess.Popen(cmd, shell=True, stdout=STDOUT, stderr=STDERR)
32
33@@ -73,7 +73,7 @@ def compile_and_run(filename, linker_options=""):
34     # Utility function that returns the stdout output from running the
35     # compiled source file; None if the compile fails.
36     cc = os.getenv("CC", "cc")
37-    cmd = "%s -Wall -o ./build_support/src/foo %s ./build_support/src/%s" % (cc, linker_options, filename)
38+    cmd = "%s -Wall -o ./build_support/src/%s ./build_support/src/%s %s -lpthread" % (cc, filename[:-2], filename, linker_options)
39
40     p = subprocess.Popen(cmd, shell=True, stdout=STDOUT, stderr=STDERR)
41
42@@ -82,7 +82,7 @@ def compile_and_run(filename, linker_options=""):
43         return None
44
45     try:
46-        s = subprocess.Popen(["./build_support/src/foo"],
47+        s = subprocess.Popen(["./build_support/src/%s" % filename[:-2]],
48                              stdout=subprocess.PIPE).communicate()[0]
49         return s.strip().decode()
50     except Exception:
51