Re: [PATCH 4/5] T360-symbol-hiding: Added code to support testing on Mac OS X.

[Tomi Ollila <tomi.ollila@iki.fi>]

On Tue, May 06 2014, Charles Celerier <cceleri@cs.stanford.edu> wrote:

> 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)).

This series LGTM. I don't understand this difference suffixing
DYLD_FALLBACK_LIBRARY_PATH with $TEST_DIRECTORY/../lib on Mac OS X
compared to prefixing LD_LIBRARY_PATH with the same on other
systems, so I take your word that it works :D

Tomi


>
> Signed-off-by: Charles Celerier <cceleri@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..97c734a 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="${DYLD_FALLBACK_LIBRARY_PATH:+$DYLD_FALLBACK_LIBRARY_PATH:}$TEST_DIRECTORY/../lib" $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)
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch