Zorba

Merge lp:~zorba-coders/zorba/bug871481 into lp:zorba

  1. bug871481
  2. Merge into trunk
Proposed by Rodolfo Ochoa
Status: Merged
Approved by: Chris Hillery
Approved revision: 10871
Merged at revision: 10887
Proposed branch: lp:~zorba-coders/zorba/bug871481
Merge into: lp:zorba
Diff against target: 68 lines (+10/-4)
3 files modified
doc/java/examples/CMakeLists.txt (+4/-1)
doc/java/examples/Test_Zorba.java (+3/-1)
doc/java/examples/java_test.bat.in (+3/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug871481
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Cezar Andrei Approve
Review via email: mp+111114@code.launchpad.net

Commit message

Error fixed on windows

Description of the change

Error fixed on windows

To post a comment you must log in.
Revision history for this message
Cezar Andrei (cezar-andrei) :
review: Approve
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug871481-2012-06-22T22-22-04.768Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug871481-2012-06-22T22-22-04.768Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/java/examples/CMakeLists.txt'
2--- doc/java/examples/CMakeLists.txt 2012-06-15 21:31:03 +0000
3+++ doc/java/examples/CMakeLists.txt 2012-06-19 22:30:26 +0000
4@@ -18,12 +18,15 @@
5
6 IF (JAVA_RUNTIME)
7 SET (Java_Load_Path ${CMAKE_BINARY_DIR}/swig/java)
8+ SET (Java_Source_Path ${CMAKE_BINARY_DIR}/swig/java)
9 MESSAGE (STATUS "Seting path for java tests ${Java_Load_Path}")
10 CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/Test_Zorba.java ${CMAKE_CURRENT_BINARY_DIR}/Test_Zorba.java COPYONLY)
11 IF (WIN32)
12+ IF (MSVC_IDE)
13+ SET (Java_Load_Path ${CMAKE_BINARY_DIR}/swig/java/${CMAKE_BUILD_TYPE})
14+ ENDIF (MSVC_IDE)
15 CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/java_test.bat.in ${CMAKE_CURRENT_BINARY_DIR}/java_test.bat)
16 ADD_TEST ("java" java_test.bat Test_Zorba)
17- EXPECTED_FAILURE (java 871481)
18 ELSEIF (WIN32)
19 CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/java_test.sh.in ${CMAKE_CURRENT_BINARY_DIR}/java_test.sh)
20 ADD_TEST ("java" java_test.sh Test_Zorba)
21
22=== modified file 'doc/java/examples/Test_Zorba.java'
23--- doc/java/examples/Test_Zorba.java 2012-06-15 21:31:03 +0000
24+++ doc/java/examples/Test_Zorba.java 2012-06-19 22:30:26 +0000
25@@ -60,7 +60,7 @@
26
27 static boolean example_3 ( Zorba aZorba )
28 {
29-
30+
31 XQuery lQuery = aZorba.compileQuery("1 div 0");
32 try
33 {
34@@ -135,11 +135,13 @@
35 System.exit ( 1 );
36
37 System.out.println ( "executing example 3" );
38+ System.out.println ( "expecting [err:FOAR0001]" );
39 res = example_3 ( zorba );
40 if (!res)
41 System.exit ( 1 );
42
43 System.out.println ( "executing example 4" );
44+ System.out.println ( "expecting [err:XPST0003]" );
45 res = example_4 ( zorba );
46 if (!res)
47 System.exit ( 1 );
48
49=== modified file 'doc/java/examples/java_test.bat.in'
50--- doc/java/examples/java_test.bat.in 2012-06-15 21:31:03 +0000
51+++ doc/java/examples/java_test.bat.in 2012-06-19 22:30:26 +0000
52@@ -15,13 +15,14 @@
53 :: limitations under the License.
54 ::
55
56-SET JAVA_LOAD_PATH=@Java_Load_Path@/@CMAKE_BUILD_TYPE@
57+SET JAVA_LOAD_PATH=@Java_Load_Path@
58+SET JAVA_SOURCE_PATH=@Java_Source_Path@
59 SET PATH=%PATH%;%JAVA_LOAD_PATH%
60
61 MKDIR build
62
63 ECHO "java_test.bat: Compile Zorba API ..."
64-"@Java_JAVAC_EXECUTABLE@" -d build %JAVA_LOAD_PATH%/*.java
65+"@Java_JAVAC_EXECUTABLE@" -d build %JAVA_SOURCE_PATH%/*.java
66
67 ECHO "java_test.bat: Compile Test_Zorba ..."
68 "@Java_JAVAC_EXECUTABLE@" -cp build -d build *.java

Subscribers

People subscribed via source and target branches