zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba.

Commit message:
re-enabled jsoniq tests and fixed the failing ones

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/170052

re-enabled jsoniq tests and fixed the failing ones
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/170052
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2013-06-18 10:23:52 +0000
+++ src/compiler/translator/translator.cpp	2013-06-18 11:54:50 +0000
@@ -15286,7 +15286,6 @@
 void* begin_visit(const JSONRenameExpr& v)
 {
   TRACE_VISIT();
-  RAISE_ERROR_NO_PARAMS(err::XPST0003, loc);
   return no_state;
 }
 

=== modified file 'test/rbkt/ExpQueryResults/zorba/jsoniq/jn_values.xml.res'
--- test/rbkt/ExpQueryResults/zorba/jsoniq/jn_values.xml.res	2013-02-07 17:24:36 +0000
+++ test/rbkt/ExpQueryResults/zorba/jsoniq/jn_values.xml.res	2013-06-18 11:54:50 +0000
@@ -1,1 +1,1 @@
-bar{ "foo" : [ 1 ] } foo
+bar{ "foo" : [ 1 ] }foo

=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt	2013-06-15 02:57:08 +0000
+++ test/rbkt/Queries/CMakeLists.txt	2013-06-18 11:54:50 +0000
@@ -155,15 +155,6 @@
     ENDIF(NEEDS_FILE)
   ENDIF(NOT ZORBA_WITH_FILE_ACCESS)
 
-  STRING(REGEX MATCH "jsoniq/" NEEDS_FILE "${TESTNAME}")
-  IF(NEEDS_FILE)
-    SET(SKIP_TEST 1)
-  ENDIF(NEEDS_FILE)
-  STRING(REGEX MATCH "cloudscript/" NEEDS_FILE "${TESTNAME}")
-  IF(NEEDS_FILE)
-    SET(SKIP_TEST 1)
-  ENDIF(NEEDS_FILE)
-
   IF (TESTNAME MATCHES "^test/rbkt/w3c_testsuite")
     IF (_testdriver_mt_available AND ZORBATEST_USE_MT_XQTS)
       # If this is an XQTS test and we want to use testdriver_mt instead,
@@ -585,3 +576,10 @@
 # external variable default expected failures
 EXPECTED_FAILURE(test/rbkt/zorba/ext_var/w3c/extvardef-014 923672) # not possible to set context item for rbkt tests
 EXPECTED_FAILURE(test/rbkt/zorba/ext_var/w3c/extvardef-016 923686)
+
+EXPECTED_FAILURE(test/rbkt/zorba/jsoniq/comment_01.jq 1067028)
+EXPECTED_FAILURE(test/rbkt/zorba/jsoniq/comment_02.jq 1067028)
+EXPECTED_FAILURE(test/rbkt/zorba/jsoniq/comment_03.jq 1067028)
+EXPECTED_FAILURE(test/rbkt/zorba/jsoniq/comment_04.jq 1067028)
+EXPECTED_FAILURE(test/rbkt/zorba/jsoniq/comment_05.jq 1067028)
+