From: David Bremner <david@tethera.net>
Date: Sat, 13 Mar 2021 12:43:37 +0000 (-0400)
Subject: test: put shim at end of LD_PRELOAD path
X-Git-Tag: 0.32_rc0~9
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=5248f55d5f11c6ed6c2344b2ed13e6ff16fc6dde;hp=3734c76d121133fbad2afbfa454bf620f7ba3a1e

test: put shim at end of LD_PRELOAD path

Certain tools like the address-sanitizer fail if they are not the
first LD_PRELOADed library. It does not seem to matter for our shims,
as long as they are loaded before libnotmuch.
---

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 1f438042..098d69da 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -1128,7 +1128,7 @@ notmuch_with_shim () {
     base_name="$1"
     shift
     shim_file="${base_name}.so"
-    LD_PRELOAD=./${shim_file}${LD_PRELOAD:+:$LD_PRELOAD} notmuch-shared "$@"
+    LD_PRELOAD=${LD_PRELOAD:+:$LD_PRELOAD}:./${shim_file} notmuch-shared "$@"
 }
 
 # Creates a script that counts how much time it is executed and calls