From c242c5a4ae156b6a4432edd3258e87eb283c7ef1 Mon Sep 17 00:00:00 2001 From: Jason Edgecombe Date: Thu, 12 Apr 2012 21:30:47 -0400 Subject: [PATCH] TESTS: Add the libwrap script to "make check" to handle library paths LICENSE MIT Change-Id: I5f77d8703a163b8b9224f64010b9e008bb386c59 Reviewed-on: http://gerrit.openafs.org/7202 Tested-by: BuildBot Reviewed-by: Garrett Wollman Reviewed-by: Derrick Brashear --- tests/Makefile.in | 2 +- tests/libwrap | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100755 tests/libwrap diff --git a/tests/Makefile.in b/tests/Makefile.in index f62f248..cb0ad70 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -19,7 +19,7 @@ runtests: runtests.o check test tests: runtests @for A in $(SUBDIRS); do cd $$A && $(MAKE) $@ && cd .. || exit 1; done - LD_LIBRARY_PATH=@TOP_OBJDIR@/lib \ + ./libwrap @TOP_OBJDIR@/lib \ ./runtests $(abs_top_srcdir)/tests/TESTS install: diff --git a/tests/libwrap b/tests/libwrap new file mode 100755 index 0000000..ae32588 --- /dev/null +++ b/tests/libwrap @@ -0,0 +1,48 @@ +#!/bin/sh +# libwrap - run a command with the specified library paths +# Parameters: path_to_library command_to_run command_parameters +# +# This was written to help run the OpenAFS test suite. +# +# License: MIT + +NEWLIB_PATH="$1" +export NEWLIB_PATH + +shift +TEST_COMMAND="$1" + +# Linux, HP-UX (64bit), Solaris, BSD +if [ -z "$LD_LIBRARY_PATH" ] ; then + LD_LIBRARY_PATH="$NEWLIB_PATH" +else + LD_LIBRARY_PATH="$NEWLIB_PATH:$LD_LIBRARY_PATH" +fi +export LD_LIBRARY_PATH + +# Mac OS X +if [ -z "$DYLD_LIBRARY_PATH" ] ; then + DYLD_LIBRARY_PATH="$NEWLIB_PATH" +else + DYLD_LIBRARY_PATH="$NEWLIB_PATH:$DYLD_LIBRARY_PATH" +fi +export DYLD_LIBRARY_PATH + +# HP-UX (32bit) +if [ -z "$SHLIB_PATH" ] ; then + SHLIB_PATH="$NEWLIB_PATH" +else + SHLIB_PATH="$NEWLIB_PATH:$SHLIB_PATH" +fi +export SHLIB_PATH + +# AIX +if [ -z "$LIBPATH" ] ; then + LIBPATH="$NEWLIB_PATH" +else + LIBPATH="$NEWLIB_PATH:$LIBPATH" +fi +export LIBPATH + +shift +"$TEST_COMMAND" "$@" -- 1.9.4