From e8e6b8cbc586bfe3cd66a3e9cd3f0df154a449ff Mon Sep 17 00:00:00 2001
From: Anhad Singh <andypython@protonmail.com>
Date: Tue, 26 Nov 2024 19:51:06 +1100
Subject: [PATCH] fix(expected): dynamic bins

Signed-off-by: Anhad Singh <andypython@protonmail.com>
---
 tests/Makefile                           | 11 ++++++-----
 tests/expected/bins_dynamic/args.stdout  |  2 +-
 tests/expected/bins_dynamic/dlfcn.stderr |  0
 tests/expected/bins_dynamic/dlfcn.stdout |  6 ++++++
 tests/expected/bins_dynamic/errno.stdout |  4 ++--
 5 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 tests/expected/bins_dynamic/dlfcn.stderr
 create mode 100644 tests/expected/bins_dynamic/dlfcn.stdout

diff --git a/tests/Makefile b/tests/Makefile
index ffea216c9b..759d95debf 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -214,11 +214,11 @@ EXPECT_INPUT_NAMES=\
 	unistd/getpass
 
 BINS=$(patsubst %,$(BUILD)/bins_static/%,$(NAMES))
-BINS+=$(patsubst %,bins_dynamic/%,$(NAMES))
-BINS+=$(patsubst %,bins_dynamic/%,$(DYNAMIC_ONLY_NAMES))
+BINS+=$(patsubst %,$(BUILD)/bins_dynamic/%,$(NAMES))
+BINS+=$(patsubst %,$(BUILD)/bins_dynamic/%,$(DYNAMIC_ONLY_NAMES))
 EXPECT_BINS=$(patsubst %,$(BUILD)/bins_static/%,$(EXPECT_NAMES))
-EXPECT_BINS+=$(patsubst %,bins_dynamic/%,$(EXPECT_NAMES))
-EXPECT_BINS+=$(patsubst %,bins_dynamic/%,$(DYNAMIC_ONLY_NAMES))
+EXPECT_BINS+=$(patsubst %,$(BUILD)/bins_dynamic/%,$(EXPECT_NAMES))
+EXPECT_BINS+=$(patsubst %,$(BUILD)/bins_dynamic/%,$(DYNAMIC_ONLY_NAMES))
 EXPECT_INPUT_BINS=$(patsubst %,$(BUILD)/bins_expect_input/%,$(EXPECT_INPUT_NAMES))
 
 CARGO_TEST?=cargo
@@ -299,7 +299,8 @@ DYNAMIC_FLAGS+=\
 	-Wl,-dynamic-linker=$(SYSROOT_LIB)/ld64.so.1 \
 	-Wl,-rpath=$(SYSROOT_LIB):\$$ORIGIN \
 	-L $(SYSROOT_LIB) \
-	-lc
+	-lc \
+	-fpic
 
 DEPS=../sysroot
 else
diff --git a/tests/expected/bins_dynamic/args.stdout b/tests/expected/bins_dynamic/args.stdout
index 4de9904e91..9260930aa6 100644
--- a/tests/expected/bins_dynamic/args.stdout
+++ b/tests/expected/bins_dynamic/args.stdout
@@ -1 +1 @@
-./bins_static/args test args 
+./bins_dynamic/args test args 
diff --git a/tests/expected/bins_dynamic/dlfcn.stderr b/tests/expected/bins_dynamic/dlfcn.stderr
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/expected/bins_dynamic/dlfcn.stdout b/tests/expected/bins_dynamic/dlfcn.stdout
new file mode 100644
index 0000000000..5b51826bea
--- /dev/null
+++ b/tests/expected/bins_dynamic/dlfcn.stdout
@@ -0,0 +1,6 @@
+add(22, 33) = 55
+puts from dlopened libc
+sharedlib: global_var == 42
+sharedlib: tls_var == 21
+main: global_var == 42
+main: tls_var == 21
diff --git a/tests/expected/bins_dynamic/errno.stdout b/tests/expected/bins_dynamic/errno.stdout
index 0cd6acd956..1ee5a8128d 100644
--- a/tests/expected/bins_dynamic/errno.stdout
+++ b/tests/expected/bins_dynamic/errno.stdout
@@ -130,8 +130,8 @@ EUSERS macro available
 EWOULDBLOCK macro available
 EXDEV macro available
 EXFULL macro available
-./bins_static/errno
-./bins_static/errno
+./bins_dynamic/errno
+./bins_dynamic/errno
 errno
 changed to argv[0]
 changed to program_invocation_name