[Libguestfs] [PATCH 1/7] java: run: Add java/.libs to LD_LIBRARY_PATH so JVM finds the right JNI file.

--- java/run-bindtests | 2 +- java/run-java-tests | 2 +- run.in | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/run-bindtests b/java/run-bindtests index a9bda18..0718f12 100755 --- a/java/run-bindtests +++ b/java/run-bindtests @@ -18,5 +18,5 @@ set -e -$JAVA_EXE -Djava.library.path=.libs Bindtests > bindtests.tmp +$JAVA_EXE Bindtests > bindtests.tmp diff -u $srcdir/../bindtests bindtests.tmp diff --git a/java/run-java-tests b/java/run-java-tests index c344396..f824c50 100755 --- a/java/run-java-tests +++ b/java/run-java-tests @@ -20,5 +20,5 @@ set -e for f in $(ls -1 t/*.class | fgrep -v \$); do classname=$(basename $f .class) - $JAVA_EXE -Djava.library.path=.libs -ea $classname + $JAVA_EXE -ea $classname done diff --git a/run.in b/run.in index d09210f..55942c6 100755 --- a/run.in +++ b/run.in @@ -79,9 +79,9 @@ export PATH # Set LD_LIBRARY_PATH to contain library. if [ -z "$LD_LIBRARY_PATH" ]; then - LD_LIBRARY_PATH="$b/src/.libs:$b/gobject/.libs" + LD_LIBRARY_PATH="$b/src/.libs:$b/java/.libs:$b/gobject/.libs" else - LD_LIBRARY_PATH="$b/src/.libs:$b/gobject/.libs:$LD_LIBRARY_PATH" + LD_LIBRARY_PATH="$b/src/.libs:$b/java/.libs:$b/gobject/.libs:$LD_LIBRARY_PATH" fi export LD_LIBRARY_PATH -- 1.8.5.3