Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 -- https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/split_XQ10_from_XQ30_reporting-2013-05-23T00-02-15.09Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba
Validation queue job split_XQ10_from_XQ30_reporting-2013-05-23T00-02-15.09Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 -- https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba
Sorin Marian Nasoi has proposed merging
lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba.
Commit message:
- split the XQ10 from XQ30 reporting; by default XQ30 reporting is assumed.
Requested reviews:
Sorin Marian Nasoi (sorin.marian.nasoi)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749
--
https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/fots_driver/README.TXT'
--- test/fots_driver/README.TXT 2013-04-09 14:22:41 +
+++ test/fots_driver/README.TXT 2013-05-20 15:01:29 +
@@ -56,6 +56,8 @@
zorba -f -q /path/to/cli.xq -e mode:=run-test-set -e testSetName:=fn-matches -o result.xml --indent
zorba -f -q /path/to/cli.xq -e mode:=run-test-set -e testSetName:=fn-matches -e usePlanSerializer:=true -o result.xml --indent
zorba -f -q /path/to/cli.xq -e mode:=run-test-case -e testSetName:=prod-Literal -e testCaseName:=Literals001 -o result.xml --indent
-zorba -f -q /path/to/cli.xq -e mode:=run-and-report -o results_Zorba_XQ30.xml --indent --disable-http-resolution
-zorba -f -q /path/to/cli.xq -e mode:=report -e resultsFilePath:=results.xml -o results_Zorba_XQ30.xml --indent
-zorba -f -q /path/to/cli.xq -e mode:=generate-expected-failures -e resultsFilePath:=failures.xml -o ExpectedFailures.xml --indent
+zorba -f -q /path/to/cli.xq -e mode:=run-and-report -e XQueryVersion:=XQ30 -o results_Zorba_XQ30.xml --indent --disable-http-resolution
+zorba -f -q /path/to/cli.xq -e mode:=run-and-report -e XQueryVersion:=XQ10 -o results_Zorba_XQ10.xml --indent --disable-http-resolution
+zorba -f -q /path/to/cli.xq -e mode:=report -e resultsFilePath:=results.xml -e XQueryVersion:=XQ30 -o results_Zorba_XQ30.xml --indent
+zorba -f -q /path/to/cli.xq -e mode:=report -e resultsFilePath:=results.xml -e XQueryVersion:=XQ10 -o results_Zorba_XQ10.xml --indent
+
=== removed file 'test/fots_driver/W3C_submission_template.xml'
--- test/fots_driver/W3C_submission_template.xml 2013-05-08 10:14:19 +
+++ test/fots_driver/W3C_submission_template.xml 1970-01-01 00:00:00 +
@@ -1,17 +0,0 @@
-test-suite-result xmlns=http://www.w3.org/2012/08/qt-fots-results;
- submission anonymous=false
-created by=Sorin Nasoi
- email=sorin.marian.nasoi_at_gmail.com
- organization=FLWOR Foundation
- on=2013-05-08/
-test-run test-suite-version=CVS
- date-run=2013-05-08/
-notes/
- /submission
- product vendor=FLWOR Foundation
-name=Zorba
-version=11439
-released=false
-open-source=true
-language=XQ30/
-/test-suite-result
=== modified file 'test/fots_driver/cli.xq'
--- test/fots_driver/cli.xq 2013-04-17 23:25:47 +
+++ test/fots_driver/cli.xq 2013-05-20 15:01:29 +
@@ -22,6 +22,9 @@
import module namespace d =
http://www.zorba-xquery.com/fots-driver; at fots-driver.xq;
+import module namespace file =
+ http://expath.org/ns/file;;
+
import module namespace r =
http://www.zorba-xquery.com/fots-driver/reporting; at reporting.xq;
@@ -165,6 +168,11 @@
:)
declare variable $usePlanSerializer as xs:string external := false;
+(:~
+ : Set reporting mode for XQuery 3.0 (meaning XQ30) or XQuery 1.0 (meaning XQ10)
+ : By default this is set to XQ30
+ :)
+declare variable $XQueryVersion as xs:string external := XQ30;
declare function local:usage() as xs:string
{
@@ -205,8 +213,10 @@
zorba -f -q /path/to/cli.xq -e mode:=run-test-set -e testSetName:=fn-matches -o result.xml --indent,
zorba -f -q /path/to/cli.xq -e mode:=run-test-set -e testSetName:=fn-matches -e usePlanSerializer:=true -o result.xml --indent,
zorba -f -q /path/to/cli.xq -e mode:=run-test-case -e testSetName:=prod-Literal -e testCaseName:=Literals001 -o result.xml --indent,
-zorba -f -q /path/to/cli.xq -e mode:=run-and-report -o results_Zorba_XQ30.xml --indent --disable-http-resolution,
-zorba -f -q /path/to/cli.xq -e mode:=report -e resultsFilePath:=results.xml -o results_Zorba_XQ30.xml --indent,
+zorba -f -q /path/to/cli.xq -e mode:=run-and-report -e XQueryVersion:=XQ30 -o results_Zorba_XQ30.xml --indent --disable-http-resolution,
+zorba -f -q /path/to/cli.xq -e mode:=run-and-report -e XQueryVersion:=XQ10 -o results_Zorba_XQ10.xml --indent --disable-http-resolution,
+zorba -f -q /path/to/cli.xq -e mode:=report -e resultsFilePath:=results.xml -e XQueryVersion:=XQ30 -o results_Zorba_XQ30.xml --indent,
+zorba -f -q /path/to/cli.xq -e mode:=report -e resultsFilePath:=results.xml -e XQueryVersion:=XQ10 -o results_Zorba_XQ10.xml --indent,
), #xA;)
};
@@ -341,9 +351,20 @@
case run-and-report
return
-{
+{
+ trace($XQueryVersion, XQuery version :);
+
+ variable $prefix:= concat(reporting,
+file:directory-separator(),
+
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba has been updated. Commit Message changed to: - split the XQ10 from XQ30 reporting; by default XQ30 reporting is assumed. - this is also a partial fix for lp:1018201 : the FOTS driver can now generate separate conformance results for XQuery 1.0 and XQuery 3.0. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 -- https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 -- https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/split_XQ10_from_XQ30_reporting-2013-05-20T15-16-47.456Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba
Validation queue job split_XQ10_from_XQ30_reporting-2013-05-20T15-16-47.456Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1, Needs Information 1, Resubmit 1. Got: 1 Approve. -- https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/split_XQ10_from_XQ30_reporting into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 -- https://code.launchpad.net/~zorba-coders/zorba/split_XQ10_from_XQ30_reporting/+merge/164749 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
