Bindings: fix java build time tests

Openwsman · Sep 11, 2013 · 39d26e6 · 39d26e6
1 parent 2c79f03
commit 39d26e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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)