From 39d26e682f186596fc34098755db38982ea70e6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Wed, 11 Sep 2013 16:34:12 +0200
Subject: [PATCH] Bindings: fix java build time tests

---
 bindings/java/tests/CMakeLists.txt | 3 ++-
 bindings/java/tests/run            | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bindings/java/tests/CMakeLists.txt b/bindings/java/tests/CMakeLists.txt
index 4ed74cc21..458cc1d54 100644
--- a/bindings/java/tests/CMakeLists.txt
+++ b/bindings/java/tests/CMakeLists.txt
@@ -28,7 +28,8 @@ ADD_TEST(bindings_java_loading     ${JAVA_RUNTIME} -cp ${CMAKE_CURRENT_BINARY_DI
 
         # Identify
 ADD_TEST(bindings_java_identify_compile ${JAVA_COMPILE} -d ${CMAKE_CURRENT_BINARY_DIR} -cp ${CMAKE_CURRENT_BINARY_DIR}/../${jar_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/identify.java )
-ADD_TEST(bindings_java_identify    ${JAVA_RUNTIME} -cp ${CMAKE_CURRENT_BINARY_DIR}/../${jar_NAME}:${CMAKE_CURRENT_BINARY_DIR} identify )
+#ADD_TEST(bindings_java_identify     ${JAVA_RUNTIME} -cp ${CMAKE_CURRENT_BINARY_DIR}/../${jar_NAME}:${CMAKE_CURRENT_BINARY_DIR} identify )
+ADD_TEST(bindings_java_identify     ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_BINARY_DIR} ${jar_NAME} identify )
 
 	# data types
 # ADD_TEST(bindings_java_fault      ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} fault )
diff --git a/bindings/java/tests/run b/bindings/java/tests/run
index 9c9654bab..cc4bf446e 100755
--- a/bindings/java/tests/run
+++ b/bindings/java/tests/run
@@ -2,8 +2,8 @@
 #
 # run script for Java tests
 #
-# Usage: run <dir> <file>
+# Usage: run <bindir> <jarname> <file>
 #
 (cd $1;
  f=`dirname $0`;
- LD_LIBRARY_PATH=$f/../../../build/src/lib java -Djava.library.path=`pwd` $2)
+ LD_LIBRARY_PATH=$f/../../../build/src/lib java -Djava.library.path=`pwd` -cp ../$2:$1 $3)