Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug871481 into
lp:zorba.
Requested reviews:
Cezar Andrei (cezar-andrei)
Chris Hillery (ceejatec)
Related bugs:
Bug #871481 in Zorba: "java test failing on Windows"
https://bugs.launchpad.net/zorba/+bug/871481
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug871481/+merge/111114
Error fixed on windows
--
https://code.launchpad.net/~zorba-coders/zorba/bug871481/+merge/111114
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'doc/java/examples/CMakeLists.txt'
--- doc/java/examples/CMakeLists.txt 2012-06-15 21:31:03 +0000
+++ doc/java/examples/CMakeLists.txt 2012-06-19 22:30:26 +0000
@@ -18,12 +18,15 @@
IF (JAVA_RUNTIME)
SET (Java_Load_Path ${CMAKE_BINARY_DIR}/swig/java)
+ SET (Java_Source_Path ${CMAKE_BINARY_DIR}/swig/java)
MESSAGE (STATUS "Seting path for java tests ${Java_Load_Path}")
CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/Test_Zorba.java ${CMAKE_CURRENT_BINARY_DIR}/Test_Zorba.java COPYONLY)
IF (WIN32)
+ IF (MSVC_IDE)
+ SET (Java_Load_Path ${CMAKE_BINARY_DIR}/swig/java/${CMAKE_BUILD_TYPE})
+ ENDIF (MSVC_IDE)
CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/java_test.bat.in ${CMAKE_CURRENT_BINARY_DIR}/java_test.bat)
ADD_TEST ("java" java_test.bat Test_Zorba)
- EXPECTED_FAILURE (java 871481)
ELSEIF (WIN32)
CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/java_test.sh.in ${CMAKE_CURRENT_BINARY_DIR}/java_test.sh)
ADD_TEST ("java" java_test.sh Test_Zorba)
=== modified file 'doc/java/examples/Test_Zorba.java'
--- doc/java/examples/Test_Zorba.java 2012-06-15 21:31:03 +0000
+++ doc/java/examples/Test_Zorba.java 2012-06-19 22:30:26 +0000
@@ -60,7 +60,7 @@
static boolean example_3 ( Zorba aZorba )
{
-
+
XQuery lQuery = aZorba.compileQuery("1 div 0");
try
{
@@ -135,11 +135,13 @@
System.exit ( 1 );
System.out.println ( "executing example 3" );
+ System.out.println ( "expecting [err:FOAR0001]" );
res = example_3 ( zorba );
if (!res)
System.exit ( 1 );
System.out.println ( "executing example 4" );
+ System.out.println ( "expecting [err:XPST0003]" );
res = example_4 ( zorba );
if (!res)
System.exit ( 1 );
=== modified file 'doc/java/examples/java_test.bat.in'
--- doc/java/examples/java_test.bat.in 2012-06-15 21:31:03 +0000
+++ doc/java/examples/java_test.bat.in 2012-06-19 22:30:26 +0000
@@ -15,13 +15,14 @@
:: limitations under the License.
::
-SET JAVA_LOAD_PATH=@Java_Load_Path@/@CMAKE_BUILD_TYPE@
+SET JAVA_LOAD_PATH=@Java_Load_Path@
+SET JAVA_SOURCE_PATH=@Java_Source_Path@
SET PATH=%PATH%;%JAVA_LOAD_PATH%
MKDIR build
ECHO "java_test.bat: Compile Zorba API ..."
-"@Java_JAVAC_EXECUTABLE@" -d build %JAVA_LOAD_PATH%/*.java
+"@Java_JAVAC_EXECUTABLE@" -d build %JAVA_SOURCE_PATH%/*.java
ECHO "java_test.bat: Compile Test_Zorba ..."
"@Java_JAVAC_EXECUTABLE@" -cp build -d build *.java
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
