java: run: Add java/.libs to LD_LIBRARY_PATH so JVM finds the right JNI file.

This commit is contained in:
Richard W.M. Jones
2014-03-07 13:26:16 +00:00
parent 16954981e2
commit 6aa64ee3a3
3 changed files with 4 additions and 4 deletions

View File

@@ -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

View File

@@ -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

4
run.in
View File

@@ -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