[PATCH v2 4/5] T360-symbol-hiding: Added code to support testing on Mac OS X.
Charles Celerier writes: > The Mac OS X platform uses *.dylib object files instead of *.so object > files for linking. Adding the path to notmuch.dylib to the end of > DYLD_FALLBACK_LIBRARY_PATH has a similar effect to adding the path to > notmuch.so to LD_LIBRARY_PATH on most Linux-based platforms (see > dyld(1)). I was about to push this, but it occured to me that until we figure out what to do about nm/objdump there wasn't much point. d
Re: [PATCH v2 4/5] T360-symbol-hiding: Added code to support testing on Mac OS X.
Charles Celerier ccel...@cs.stanford.edu writes: The Mac OS X platform uses *.dylib object files instead of *.so object files for linking. Adding the path to notmuch.dylib to the end of DYLD_FALLBACK_LIBRARY_PATH has a similar effect to adding the path to notmuch.so to LD_LIBRARY_PATH on most Linux-based platforms (see dyld(1)). I was about to push this, but it occured to me that until we figure out what to do about nm/objdump there wasn't much point. d ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH v2 4/5] T360-symbol-hiding: Added code to support testing on Mac OS X.
The Mac OS X platform uses *.dylib object files instead of *.so object
files for linking. Adding the path to notmuch.dylib to the end of
DYLD_FALLBACK_LIBRARY_PATH has a similar effect to adding the path to
notmuch.so to LD_LIBRARY_PATH on most Linux-based platforms (see
dyld(1)).
Signed-off-by: Charles Celerier
---
test/T360-symbol-hiding.sh | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh
index 636ec91..9239fc1 100755
--- a/test/T360-symbol-hiding.sh
+++ b/test/T360-symbol-hiding.sh
@@ -12,7 +12,14 @@ test_description='exception symbol hiding'
. ./test-lib.sh
run_test(){
-
result=$(LD_LIBRARY_PATH="$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
$TEST_DIRECTORY/symbol-test 2>&1)
+case $(uname -s) in
+Darwin)
+
result=$(DYLD_FALLBACK_LIBRARY_PATH="$TEST_DIRECTORY/../lib${DYLD_FALLBACK_LIBRARY_PATH:+:$DYLD_FALLBACK_LIBRARY_PATH}"
$TEST_DIRECTORY/symbol-test 2>&1)
+;;
+*)
+
result=$(LD_LIBRARY_PATH="$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
$TEST_DIRECTORY/symbol-test 2>&1)
+;;
+esac
}
output="A Xapian exception occurred opening database: Couldn't stat
'fakedb/.notmuch/xapian'
--
1.8.5.2 (Apple Git-48)
[PATCH v2 4/5] T360-symbol-hiding: Added code to support testing on Mac OS X.
The Mac OS X platform uses *.dylib object files instead of *.so object
files for linking. Adding the path to notmuch.dylib to the end of
DYLD_FALLBACK_LIBRARY_PATH has a similar effect to adding the path to
notmuch.so to LD_LIBRARY_PATH on most Linux-based platforms (see
dyld(1)).
Signed-off-by: Charles Celerier ccel...@cs.stanford.edu
---
test/T360-symbol-hiding.sh | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh
index 636ec91..9239fc1 100755
--- a/test/T360-symbol-hiding.sh
+++ b/test/T360-symbol-hiding.sh
@@ -12,7 +12,14 @@ test_description='exception symbol hiding'
. ./test-lib.sh
run_test(){
-
result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
$TEST_DIRECTORY/symbol-test 21)
+case $(uname -s) in
+Darwin)
+
result=$(DYLD_FALLBACK_LIBRARY_PATH=$TEST_DIRECTORY/../lib${DYLD_FALLBACK_LIBRARY_PATH:+:$DYLD_FALLBACK_LIBRARY_PATH}
$TEST_DIRECTORY/symbol-test 21)
+;;
+*)
+
result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
$TEST_DIRECTORY/symbol-test 21)
+;;
+esac
}
output=A Xapian exception occurred opening database: Couldn't stat
'fakedb/.notmuch/xapian'
--
1.8.5.2 (Apple Git-48)
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch
