Zorba

Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba

  1. markos-scratch
  2. Merge into trunk
Proposed by Markos Zaharioudakis
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 11153
Merged at revision: 11523
Proposed branch: lp:~zorba-coders/zorba/markos-scratch
Merge into: lp:zorba
Diff against target: 49 lines (+8/-11)
3 files modified
src/compiler/translator/translator.cpp (+0/-1)
test/rbkt/ExpQueryResults/zorba/jsoniq/jn_values.xml.res (+1/-1)
test/rbkt/Queries/CMakeLists.txt (+7/-9)
To merge this branch: bzr merge lp:~zorba-coders/zorba/markos-scratch
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Review via email: mp+170052@code.launchpad.net

Commit message

re-enabled jsoniq tests and fixed the failing ones

Description of the change

re-enabled jsoniq tests and fixed the failing ones

To post a comment you must log in.
Revision history for this message
Markos Zaharioudakis (markos-za) :
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/markos-scratch-2013-06-18T11-56-58.149Z/log.html

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

Validation queue job markos-scratch-2013-06-18T11-56-58.149Z 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 'src/compiler/translator/translator.cpp'
2--- src/compiler/translator/translator.cpp 2013-06-18 10:23:52 +0000
3+++ src/compiler/translator/translator.cpp 2013-06-18 11:54:50 +0000
4@@ -15286,7 +15286,6 @@
5 void* begin_visit(const JSONRenameExpr& v)
6 {
7 TRACE_VISIT();
8- RAISE_ERROR_NO_PARAMS(err::XPST0003, loc);
9 return no_state;
10 }
11
12
13=== modified file 'test/rbkt/ExpQueryResults/zorba/jsoniq/jn_values.xml.res'
14--- test/rbkt/ExpQueryResults/zorba/jsoniq/jn_values.xml.res 2013-02-07 17:24:36 +0000
15+++ test/rbkt/ExpQueryResults/zorba/jsoniq/jn_values.xml.res 2013-06-18 11:54:50 +0000
16@@ -1,1 +1,1 @@
17-bar{ "foo" : [ 1 ] } foo
18+bar{ "foo" : [ 1 ] }foo
19
20=== modified file 'test/rbkt/Queries/CMakeLists.txt'
21--- test/rbkt/Queries/CMakeLists.txt 2013-06-15 02:57:08 +0000
22+++ test/rbkt/Queries/CMakeLists.txt 2013-06-18 11:54:50 +0000
23@@ -155,15 +155,6 @@
24 ENDIF(NEEDS_FILE)
25 ENDIF(NOT ZORBA_WITH_FILE_ACCESS)
26
27- STRING(REGEX MATCH "jsoniq/" NEEDS_FILE "${TESTNAME}")
28- IF(NEEDS_FILE)
29- SET(SKIP_TEST 1)
30- ENDIF(NEEDS_FILE)
31- STRING(REGEX MATCH "cloudscript/" NEEDS_FILE "${TESTNAME}")
32- IF(NEEDS_FILE)
33- SET(SKIP_TEST 1)
34- ENDIF(NEEDS_FILE)
35-
36 IF (TESTNAME MATCHES "^test/rbkt/w3c_testsuite")
37 IF (_testdriver_mt_available AND ZORBATEST_USE_MT_XQTS)
38 # If this is an XQTS test and we want to use testdriver_mt instead,
39@@ -585,3 +576,10 @@
40 # external variable default expected failures
41 EXPECTED_FAILURE(test/rbkt/zorba/ext_var/w3c/extvardef-014 923672) # not possible to set context item for rbkt tests
42 EXPECTED_FAILURE(test/rbkt/zorba/ext_var/w3c/extvardef-016 923686)
43+
44+EXPECTED_FAILURE(test/rbkt/zorba/jsoniq/comment_01.jq 1067028)
45+EXPECTED_FAILURE(test/rbkt/zorba/jsoniq/comment_02.jq 1067028)
46+EXPECTED_FAILURE(test/rbkt/zorba/jsoniq/comment_03.jq 1067028)
47+EXPECTED_FAILURE(test/rbkt/zorba/jsoniq/comment_04.jq 1067028)
48+EXPECTED_FAILURE(test/rbkt/zorba/jsoniq/comment_05.jq 1067028)
49+

Subscribers

People subscribed via source and target branches