[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump_FOTS_snapshot_1_May into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump_FOTS_snapshot_1_May into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 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/bump_FOTS_snapshot_1_May into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bump_FOTS_snapshot_1_May into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bump_FOTS_snapshot_1_May-2013-05-01T05-58-37.872Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 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/bump_FOTS_snapshot_1_May into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bump_FOTS_snapshot_1_May-2013-05-01T05-58-37.872Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 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/fix_bug_1172276 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix_bug_1172276 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771 -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/fix_bug_1172276 into 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/fix_bug_1172276 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/fix_bug_1172276 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job fix_bug_1172276-2013-05-01T05-34-44.47Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/fix_bug_1172276 into 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/fix_bug_1172276 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_1172276-2013-05-01T05-34-44.47Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/fix_bug_1172276 into 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/bump_FOTS_snapshot_1_May into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump_FOTS_snapshot_1_May into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 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/bump_FOTS_snapshot_1_May into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump_FOTS_snapshot_1_May into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 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/bump_FOTS_snapshot_1_May into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bump_FOTS_snapshot_1_May into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bump_FOTS_snapshot_1_May-2013-05-01T05-11-39.911Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 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/bump_FOTS_snapshot_1_May into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 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/bump_FOTS_snapshot_1_May into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bump_FOTS_snapshot_1_May-2013-05-01T05-11-39.911Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bump_FOTS_snapshot_1_May into 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/fix_bug_1172276 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix_bug_1172276 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771 -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/fix_bug_1172276 into 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/fix_bug_1172276 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/fix_bug_1172276 into 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/bump_FOTS_snapshot_1_May into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump_FOTS_snapshot_1_May into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bump_FOTS_snapshot_1_May into 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/bump_FOTS_snapshot_1_May into lp:zorba
You have been requested to review the proposed merge of lp:~zorba-coders/zorba/bump_FOTS_snapshot_1_May into lp:zorba. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bump_FOTS_snapshot_1_May into lp:zorba. === modified file 'test/fots/CMakeLists.txt' --- test/fots/CMakeLists.txt 2013-04-30 23:54:17 + +++ test/fots/CMakeLists.txt 2013-05-01 05:07:39 + @@ -150,7 +150,6 @@ EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-027 21568) EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-029 21568) EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-031 21568) -EXPECTED_FOTS_FAILURE (DISPUTED prod-VarDefaultValue extvardef-006b 21832) # Next three possibly unique to old RQ machine, but they need to be # marked for the RQ to pass. === modified file 'test/fots/ImportFOTS.cmake' --- test/fots/ImportFOTS.cmake 2013-04-23 02:39:22 + +++ test/fots/ImportFOTS.cmake 2013-05-01 05:07:39 + @@ -19,7 +19,7 @@ # Change this to publish updated FOTS archives -SET (FOTS_ARCHIVE "FOTS_230413.tgz") +SET (FOTS_ARCHIVE "FOTS_010513.tgz") # Change this to modify which elements in FOTS driver results are output # as CDATA -- 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/bump_FOTS_snapshot_1_May into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bump_FOTS_snapshot_1_May into 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/fix_bug_1172276 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix_bug_1172276 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771 -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/fix_bug_1172276 into 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:~paul-lucas/zorba/bug-1090089 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1090089 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962 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/fix_bug_1172276 into lp:zorba
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/fix_bug_1172276 into 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/bump_FOTS_snapshot_1_May into lp:zorba
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/bump_FOTS_snapshot_1_May into lp:zorba. Commit message: - bumped FOTS snapshot to May 1st - removed DISPUTED test-case because corresponding bug in FOTS was addressed Requested reviews: Zorba Coders (zorba-coders) Sorin Marian Nasoi (sorin.marian.nasoi) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 -- https://code.launchpad.net/~zorba-coders/zorba/bump_FOTS_snapshot_1_May/+merge/161773 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bump_FOTS_snapshot_1_May into lp:zorba. === modified file 'test/fots/CMakeLists.txt' --- test/fots/CMakeLists.txt 2013-04-30 23:54:17 + +++ test/fots/CMakeLists.txt 2013-05-01 05:07:39 + @@ -150,7 +150,6 @@ EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-027 21568) EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-029 21568) EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-031 21568) -EXPECTED_FOTS_FAILURE (DISPUTED prod-VarDefaultValue extvardef-006b 21832) # Next three possibly unique to old RQ machine, but they need to be # marked for the RQ to pass. === modified file 'test/fots/ImportFOTS.cmake' --- test/fots/ImportFOTS.cmake 2013-04-23 02:39:22 + +++ test/fots/ImportFOTS.cmake 2013-05-01 05:07:39 + @@ -19,7 +19,7 @@ # Change this to publish updated FOTS archives -SET (FOTS_ARCHIVE "FOTS_230413.tgz") +SET (FOTS_ARCHIVE "FOTS_010513.tgz") # Change this to modify which elements in FOTS driver results are output # as CDATA -- 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/fix_bug_1172276 into lp:zorba
You have been requested to review the proposed merge of
lp:~zorba-coders/zorba/fix_bug_1172276 into lp:zorba.
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771
--
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771
Your team Zorba Coders is requested to review the proposed merge of
lp:~zorba-coders/zorba/fix_bug_1172276 into lp:zorba.
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-04-30 23:54:17 +
+++ test/fots/CMakeLists.txt 2013-05-01 05:03:26 +
@@ -151,6 +151,13 @@
EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-029 21568)
EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-031 21568)
EXPECTED_FOTS_FAILURE (DISPUTED prod-VarDefaultValue extvardef-006b 21832)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-003 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-004 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-005 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-026 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-028 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-031 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-032 21868)
# Next three possibly unique to old RQ machine, but they need to be
# marked for the RQ to pass.
@@ -252,7 +259,6 @@
EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-6 0)
EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-9 0)
EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-10 0)
-EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-11 0)
EXPECTED_FOTS_FAILURE (misc-XMLEdition XML10-4ed-Excluded-char-1 0)
EXPECTED_FOTS_FAILURE (misc-XMLEdition XML11-1ed-Included-char-1 0)
EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0)
@@ -326,16 +332,8 @@
EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-collide-var-001 0)
EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-collide-fn-001 0)
EXPECTED_FOTS_FAILURE (prod-ModuleImport errata8-002a 0)
-EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-003 0)
-EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-004 0)
-EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-005 0)
-EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-026 0)
-EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-027 0)
-EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-028 0)
-EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-029 0)
-EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-030 0)
-EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-031 0)
-EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-032 0)
+EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-30 0)
+EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-34 0)
EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy40 0)
EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy41 0)
EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy49 0)
=== modified file 'test/fots_driver/evaluate.xq'
--- test/fots_driver/evaluate.xq 2013-04-17 19:10:37 +
+++ test/fots_driver/evaluate.xq 2013-05-01 05:03:26 +
@@ -548,19 +548,19 @@
) as xs:string?
{
try {
- let $serResult:= fn:serialize($result, $util:serParamXml)
- let $serExpResult := fn:serialize($expResult, $util:serParamXml)
- let $matchesFlags := data($expResult/@flags)
+ let $serResult := fn:serialize($result)
+ let $regex := fn:string($expResult)
+ let $flags := data($expResult/@flags)
return
-if (exists($matchesFlags))
+if (exists($flags))
then
- if (matches($serResult, $serExpResult, $matchesFlags))
+ if (matches($serResult, $regex, $flags))
then ()
else concat("'serialization-matches' returned: result does not match expected result with flags '",
- $matchesFlags,
+ $flags,
"'.")
else
- if (matches($serResult, $serExpResult))
+ if (matches($serResult, $regex))
then ()
else "'serialization-matches' returned: result does not match expected result."
} catch * {
--
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:~paul-lucas/zorba/bug-1090089 into lp:zorba
The attempt to merge lp:~paul-lucas/zorba/bug-1090089 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug-1090089-2013-05-01T04-39-58.887Z is finished. The final status was: 8 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962 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/fix_bug_1172276 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix_bug_1172276 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771 -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771 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/fix_bug_1172276 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771 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/fix_bug_1172276 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix_bug_1172276 into lp:zorba has been updated. Commit Message changed to: - fix for eval:serialization-matches that made some of the "prod-OptionDecl.serialization" failing test case to pass because the serialization params defined in the prolog are the same as the default ones in Zorba - marked the rest of the failures as DISPUTED: please see W3C bug #21868 - removed EXPECTED_FOTS_FAILURE for "K2-Serialization-11" For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771 -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771 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/fix_bug_1172276 into lp:zorba
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/fix_bug_1172276
into lp:zorba.
Commit message:
- fix for eval:serialization-matches that made some of the
"prod-OptionDecl.serialization" failing test case to pass because the
serialization params defined in the prolog are the same as the default ones in
Zorba
- marked the rest of the failures as DISPUTED: please see W3C bug #21868
- removed EXPECTED_FOTS_FAILURE for "K2-Serialization-11"
Requested reviews:
Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
Bug #1172276 in Zorba: ""serialization-matches" assertion bug"
https://bugs.launchpad.net/zorba/+bug/1172276
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771
--
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1172276/+merge/161771
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-04-30 23:54:17 +
+++ test/fots/CMakeLists.txt 2013-05-01 04:46:31 +
@@ -151,6 +151,13 @@
EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-029 21568)
EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-031 21568)
EXPECTED_FOTS_FAILURE (DISPUTED prod-VarDefaultValue extvardef-006b 21832)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-003 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-004 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-005 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-026 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-028 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-031 21868)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-OptionDecl.serialization Serialization-032 21868)
# Next three possibly unique to old RQ machine, but they need to be
# marked for the RQ to pass.
@@ -252,7 +259,6 @@
EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-6 0)
EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-9 0)
EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-10 0)
-EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-11 0)
EXPECTED_FOTS_FAILURE (misc-XMLEdition XML10-4ed-Excluded-char-1 0)
EXPECTED_FOTS_FAILURE (misc-XMLEdition XML11-1ed-Included-char-1 0)
EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0)
@@ -326,6 +332,7 @@
EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-collide-var-001 0)
EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-collide-fn-001 0)
EXPECTED_FOTS_FAILURE (prod-ModuleImport errata8-002a 0)
+<<< TREE
EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-003 0)
EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-004 0)
EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-005 0)
@@ -336,6 +343,10 @@
EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-030 0)
EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-031 0)
EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-032 0)
+===
+EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-30 0)
+EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-34 0)
+>>> MERGE-SOURCE
EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy40 0)
EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy41 0)
EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy49 0)
=== modified file 'test/fots_driver/evaluate.xq'
--- test/fots_driver/evaluate.xq 2013-04-17 19:10:37 +
+++ test/fots_driver/evaluate.xq 2013-05-01 04:46:31 +
@@ -548,19 +548,19 @@
) as xs:string?
{
try {
- let $serResult:= fn:serialize($result, $util:serParamXml)
- let $serExpResult := fn:serialize($expResult, $util:serParamXml)
- let $matchesFlags := data($expResult/@flags)
+ let $serResult := fn:serialize($result)
+ let $regex := fn:string($expResult)
+ let $flags := data($expResult/@flags)
return
-if (exists($matchesFlags))
+if (exists($flags))
then
- if (matches($serResult, $serExpResult, $matchesFlags))
+ if (matches($serResult, $regex, $flags))
then ()
else concat("'serialization-matches' returned: result does not match expected result with flags '",
- $matchesFlags,
+ $flags,
"'.")
else
- if (matches($serResult, $serExpResult))
+ if (matches($serResult, $regex))
then ()
else "'serialization-matches' returned: result does not match expected result."
} catch * {
--
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:~paul-lucas/zorba/bug-1090089 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1090089-2013-05-01T04-39-58.887Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/161770 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/161770 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:~paul-lucas/zorba/pjl-misc 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/~paul-lucas/zorba/pjl-misc/+merge/161770 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:~paul-lucas/zorba/bug-1090089 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1090089 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-05-01T04-04-52.812Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/161770 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-05-01T04-04-52.812Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/161770 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/161770 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/161770 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/161770 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Commit Message changed to: 1. Fixed ASCII testing (although it's not clear how it worked up until now on Mac OS X). 2. Removed remnants of xqpString types. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/161770 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/161770 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Description changed to: 1. Fixed ASCII testing (although it's not clear how it worked up until now on Mac OS X). 2. Removed remnants of xqpString types. For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/161770 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/161770 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/1025564 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/1025564 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 -- https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/161770
Fixed ASCII testing (although it's not clear how it worked up until now on Mac
OS X).
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/161770
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/common/shared_types.h'
--- src/common/shared_types.h 2013-02-07 17:24:36 +
+++ src/common/shared_types.h 2013-05-01 03:59:31 +
@@ -121,9 +121,6 @@
class GMonthDay;
class GDay;
class GMonth;
-class xqpString;
-class xqpStringStore;
-typedef rchandle xqpStringStore_t;
typedef rchandle DateTime_t;
typedef rchandle Date_t;
typedef rchandle Time_t;
=== modified file 'src/util/ascii_util.h'
--- src/util/ascii_util.h 2013-03-26 00:11:11 +
+++ src/util/ascii_util.h 2013-05-01 03:59:31 +
@@ -118,12 +118,7 @@
*/
template inline
bool is_alpha( CharType c ) {
-#ifdef WIN32
- // Windows' isalpha() implementation crashes for non-ASCII characters.
- return __isascii( c ) && isalpha( c );
-#else
- return isalpha( c );
-#endif
+ return is_ascii( c ) && isalpha( c );
}
/**
@@ -137,12 +132,7 @@
*/
template inline
bool is_alnum( CharType c ) {
-#ifdef WIN32
- // Windows' isalpha() implementation crashes for non-ASCII characters.
- return __isascii( c ) && isalnum( c );
-#else
- return isalnum( c );
-#endif
+ return is_ascii( c ) && isalnum( c );
}
/**
@@ -156,12 +146,7 @@
*/
template inline
bool is_cntrl( CharType c ) {
-#ifdef WIN32
- // Windows' iscntrl() implementation crashes for non-ASCII characters.
- return __isascii( c ) && iscntrl( c );
-#else
- return iscntrl( c );
-#endif
+ return is_ascii( c ) && iscntrl( c );
}
/**
@@ -175,12 +160,7 @@
*/
template inline
bool is_digit( CharType c ) {
-#ifdef WIN32
- // Windows' isdigit() implementation crashes for non-ASCII characters.
- return __isascii( c ) && isdigit( c );
-#else
- return isdigit( c );
-#endif
+ return is_ascii( c ) && isdigit( c );
}
/**
@@ -194,12 +174,7 @@
*/
template inline
bool is_print( CharType c ) {
-#ifdef WIN32
- // Windows' isprint() implementation crashes for non-ASCII characters.
- return __isascii( c ) && isprint( c );
-#else
- return isprint( c );
-#endif
+ return is_ascii( c ) && isprint( c );
}
/**
@@ -213,12 +188,7 @@
*/
template inline
bool is_punct( CharType c ) {
-#ifdef WIN32
- // Windows' ispunct() implementation crashes for non-ASCII characters.
- return __isascii( c ) && ispunct( c );
-#else
- return ispunct( c );
-#endif
+ return is_ascii( c ) && ispunct( c );
}
/**
@@ -232,12 +202,7 @@
*/
template inline
bool is_space( CharType c ) {
-#ifdef WIN32
- // Windows' isspace() implementation crashes for non-ASCII characters.
- return __isascii( c ) && isspace( c );
-#else
- return isspace( c );
-#endif
+ return is_ascii( c ) && isspace( c );
}
/**
@@ -270,12 +235,7 @@
*/
template inline
bool is_xdigit( CharType c ) {
-#ifdef WIN32
- // Windows' isxdigit() implementation crashes for non-ASCII characters.
- return __isascii( c ) && isxdigit( c );
-#else
- return isxdigit( c );
-#endif
+ return is_ascii( c ) && isxdigit( c );
}
// begins/ends_with ///
=== modified file 'src/util/utf8_util.tcc'
--- src/util/utf8_util.tcc 2013-04-20 00:50:38 +
+++ src/util/utf8_util.tcc 2013-05-01 03:59:31 +
@@ -33,12 +33,12 @@
template back_html_uri_insert_iterator&
back_html_uri_insert_iterator::operator=( value_type c ) {
char const dec2hex[] = "0123456789ABCDEF";
- unsigned u = c & 0xFF;
- if ( !isprint( u ) ) {
+ unsigned u = c & 0xFFu;
+ if ( !ascii::is_print( u ) ) {
utf8::encoded_char_type ec;
utf8::size_type const bytes = utf8::encode( c, ec );
for ( size_type i = 0; i < bytes; ++i ) {
- u = ec[i] & 0xFF;
+ u = ec[i] & 0xFFu;
buf_[1] = dec2hex[ u >> 4 ];
buf_[2] = dec2hex[ u & 0x0F ];
this->container->append( buf_, 3 );
@@ -52,13 +52,13 @@
template back_iri_insert_iterator&
back_iri_insert_iterator::operator=( value_type c ) {
char const dec2hex[] = "0123456789ABCDEF";
- unsigned u = c & 0xFF;
+ unsigned u = c & 0xFFu;
if ( unicode::is_ucschar( c ) || unicode::is_iprivate( c ) ||
unicode::is_invalid_in_iri( c ) ) {
utf8::encoded_char_type ec;
utf8::size_type const bytes = utf8::encode( c, ec );
for ( size_type i = 0; i < bytes; ++i ) {
- u = ec[i] & 0xFF;;
+ u = ec[i] & 0xFFu;
buf_[1] = dec2hex[ u >> 4 ];
buf_[2] = dec2hex[ u & 0x0F ];
this->container->append( buf_, 3 );
--
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/1025564 into lp:zorba
Validation queue job 1025564-2013-05-01T03-32-07.037Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 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/bug-867376 into lp:zorba
Review: Needs Fixing There are still some test failures. serialize-direct-uris now throws ZURI errors, which is good, but the test needs to be adapted for that (split the failing cases into separate tests with a .spec file containing the Error: you expect). More worrying, FOTS/fn-resolve-uri is failing. I'm looking into that one a bit. -- https://code.launchpad.net/~zorba-coders/zorba/bug-867376/+merge/159233 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/1025564 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/1025564-2013-05-01T03-32-07.037Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 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/1025564 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/1025564 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 -- https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 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/1025564 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/1025564 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 -- https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 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/1025564 into lp:zorba
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 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/1025564 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/1025564 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 -- https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161732 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161732 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/markos-scratch into lp:zorba
Validation queue job markos-scratch-2013-05-01T00-01-45.175Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161732 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:~paul-lucas/zorba/bug-1090089 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1090089 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962 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:~paul-lucas/zorba/bug-1090089 into lp:zorba
The attempt to merge lp:~paul-lucas/zorba/bug-1090089 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug-1090089-2013-04-30T23-29-18.17Z is finished. The final status was: 25 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161732 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161732 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/markos-scratch into lp:zorba
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161732 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/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-05-01T00-01-45.175Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161732 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161732 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161732 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161732 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161732 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/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161732 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/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba. Commit message: Fixed bug in casting to normalizedString Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161732 Fixed bug in casting to normalizedString -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161732 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:~paul-lucas/zorba/bug-1090089 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1090089 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962 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:~paul-lucas/zorba/bug-1090089 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1090089-2013-04-30T23-29-18.17Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-1090089/+merge/160962 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/1025564 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/1025564 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 -- https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 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/1025564 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/1025564 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job 1025564-2013-04-30T22-40-03.37Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 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/1025564 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/1025564-2013-04-30T22-40-03.37Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 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/1025564 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 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/1025564 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/1025564 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 -- https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 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/1025564 into lp:zorba
That bug was never part of this proposal. I think it's showing up in the did here due to my merge from the trunk. The Changelog had a number of things get rearranged which made conflict resolution hard. That bug is in fact fixed so I assume it should be in the Changelog. -- https://code.launchpad.net/~zorba-coders/zorba/1025564/+merge/125256 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/bug-1015468 into lp:zorba
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1015468
into lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
Related bugs:
Bug #1015468 in Zorba: "wrong uri resolution with fn:resolve-uri()"
https://bugs.launchpad.net/zorba/+bug/1015468
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/unit_tests/test_uri.cpp'
--- src/unit_tests/test_uri.cpp 2013-02-07 17:24:36 +
+++ src/unit_tests/test_uri.cpp 2013-04-30 22:07:29 +
@@ -608,7 +608,21 @@
"",
"",
"localhost/Ångström/b/c" // path notation
-}
+},
+{
+ "file:///test.xml",
+ "#id",
+ "file:///test.xml#id",
+ "file",
+ 0,
+ "id",
+ "",
+ "",
+ "/test.xml",
+ "",
+ "",
+ "/test.xml"
+ }
}; // URITestEntry tests[]
=== modified file 'src/zorbatypes/URI.cpp'
--- src/zorbatypes/URI.cpp 2013-02-07 17:24:36 +
+++ src/zorbatypes/URI.cpp 2013-04-30 22:07:29 +
@@ -1279,7 +1279,7 @@
base_uri->get_path(path);
zstring::size_type last_slash = path.rfind("/");
- if ( last_slash != zstring::npos )
+ if ( last_slash != zstring::npos && (last_slash != 0) )
thePath = path.substr(0, last_slash+1);
else
thePath = path;
@@ -1287,7 +1287,8 @@
set_state(Path);
}
-if ( (! is_set(QueryString)) )
+if ( !is_set(QueryString) && base_uri->is_set(QueryString) &&
+ !base_uri->get_encoded_query().empty() )
{
base_uri->get_query(theQueryString);
--
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/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
Validation queue job bug1147563-2013-04-30T21-01-02.777Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1147563-2013-04-30T21-01-02.777Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug1147563-2013-04-30T20-48-46.113Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1147563-2013-04-30T20-48-46.113Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1147563-2013-04-30T20-17-46.51Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug1147563-2013-04-30T20-17-46.51Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug1147563-2013-04-30T19-59-49.898Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1064978 into lp:zorba
> Why don't you use XQType::getQName to get the QName directly and return it? Because if the type is not atomic, if it is an element or an object it throws a zorba exception. -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696 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/bug1147563 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1147563-2013-04-30T19-59-49.898Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1147563 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1064978 into lp:zorba
Why don't you use XQType::getQName to get the QName directly and return it? -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161672 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161672 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/markos-scratch into lp:zorba
Validation queue job markos-scratch-2013-04-30T18-53-48.532Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161672 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/bug1064978 into lp:zorba
This changes remove the constant return String on xs:anyType it now uses the type manager to create an anyType item type and return it's string value. With this change the query you mentioned using local-name-from-QName works correctly. -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696 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/bug-1103819 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1103819 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1103819/+merge/146312 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1103819/+merge/146312 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/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-04-30T18-53-48.532Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161672 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/bug-1103819 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-1103819 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug-1103819-2013-04-30T18-29-01.523Z is finished. The final status was: 117 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug-1103819/+merge/146312 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/bug1064978 into lp:zorba
> import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
>
> variable $queryID := xqxq:prepare-main-module('declare variable $ext2
> external; $ext2');
>
> fn:local-name-from-QName(xqxq:variable-type-name($queryID, xs:QName('ext2')))
>
> returns xs:anyType. Shouldn't it be anyType? I think the QName is not
> constructed
> correctly.
What do you mean is not being constructed correctly?
>
> xs:anyType should not be a string constant in the code. I think this should
> come from the typemanager.
The thing with the variables that doesn't have a type specified in code when
asked about the XQType of the variable using the function var->getType it
returns a NULL pointer that is why a set a constant value of xs:anyType, now
you don't want this to be constant what should I do then? create a new any
type XQType variable using the TypeManager and return it's schemaString()?
--
https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696
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/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161672 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/bug1064978 into lp:zorba
Review: Needs Fixing
import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
variable $queryID := xqxq:prepare-main-module('declare variable $ext2 as
xs:integer? external; $ext2');
fn:local-name-from-QName(xqxq:variable-type-name($queryID, xs:QName('ext2')))
returns
xs:integer?.
That's not a local-name.
--
https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696
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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161672 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161672 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/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Commit message:
Fixed bug in handling the type declaration of a FOR variable that allows empty.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161672
Fixed bug in handling the type declaration of a FOR variable that allows empty.
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161672
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2013-04-25 02:37:42 +
+++ ChangeLog 2013-04-30 18:33:35 +
@@ -49,6 +49,7 @@
* Fixed bug #1124273 (xqdoc crash because of annotation literals)
* Fixed bug #1085408 (xs:date(): casting large year values)
* Fixed bug #867027 (XQST0059 error messages inconsistent)
+ * Fixed bug in handling the type declaration of a FOR variable that allows empty.
* Fixed bug #1095889 (Improve error message for xml-parsing error).
* Fixed bug #1131984 (apparently invalid regex in queries)
* Fixed bug #1123163 (fn:format-integer failures)
=== modified file 'src/compiler/expression/flwor_expr.cpp'
--- src/compiler/expression/flwor_expr.cpp 2013-04-25 11:56:50 +
+++ src/compiler/expression/flwor_expr.cpp 2013-04-30 18:33:35 +
@@ -143,7 +143,21 @@
if (!TypeOps::is_equal(tm, *rtm.ITEM_TYPE_STAR, *declaredType, loc))
{
if (kind == flwor_clause::for_clause)
- declaredType = tm->create_type(*declaredType, domainType->get_quantifier());
+{
+ TypeConstants::quantifier_t domQuant = domainType->get_quantifier();
+ TypeConstants::quantifier_t declQuant = declaredType->get_quantifier();
+
+ if (theAllowingEmpty &&
+ (declQuant == TypeConstants::QUANT_ONE ||
+ declQuant == TypeConstants::QUANT_PLUS))
+ {
+declaredType = tm->create_type(*declaredType, TypeConstants::QUANT_PLUS);
+ }
+ else
+ {
+declaredType = tm->create_type(*declaredType, domQuant);
+ }
+}
if (!TypeOps::is_subtype(tm, *domainType, *declaredType, loc))
{
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-04-29 20:51:57 +
+++ src/compiler/translator/translator.cpp 2013-04-30 18:33:35 +
@@ -8840,7 +8840,7 @@
expr* e1 = pop_nodestack();
expr* e2 = pop_nodestack();
- fo_expr* e = theExprManager->create_fo_expr(theRootSctx, theUDF, loc, BUILTIN_FUNC(OP_TO_2), e2, e1);
+ fo_expr* e = CREATE(fo)(theRootSctx, theUDF, loc, BUILTIN_FUNC(OP_TO_2), e2, e1);
normalize_fo(e);
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-04-29 18:47:57 +
+++ test/fots/CMakeLists.txt 2013-04-30 18:33:35 +
@@ -254,7 +254,6 @@
EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-11 0)
EXPECTED_FOTS_FAILURE (misc-XMLEdition XML10-4ed-Excluded-char-1 0)
EXPECTED_FOTS_FAILURE (misc-XMLEdition XML11-1ed-Included-char-1 0)
-EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-013 0)
EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0)
EXPECTED_FOTS_FAILURE (prod-Annotation annotation-30 0)
EXPECTED_FOTS_FAILURE (prod-Annotation annotation-31 0)
--
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/bug-1103819 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1103819-2013-04-30T18-29-01.523Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1103819/+merge/146312 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/bug1064978 into lp:zorba
> the build doesn't work for me:
>
> /home/mbrantner/zorba/sandbox/src/api/staticcontextimpl.cpp: In member
> function 'virtual zorba::Item
> zorba::StaticContextImpl::getVariablePrimeType(const zorba::Item&)':
> /home/mbrantner/zorba/sandbox/src/api/staticcontextimpl.cpp:1808:12: error:
> could not convert 'type' from 'zorba::store::Item_t {aka
> zorba::store::ItemHandle}' to 'zorba::Item'
I pushed a fix for the build.
--
https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696
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/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839 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/bug1064978 into lp:zorba
Review: Needs Fixing
import module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
variable $queryID := xqxq:prepare-main-module('declare variable $ext2 external;
$ext2');
fn:local-name-from-QName(xqxq:variable-type-name($queryID, xs:QName('ext2')))
returns xs:anyType. Shouldn't it be anyType? I think the QName is not
constructed
correctly.
xs:anyType should not be a string constant in the code. I think this should
come from the typemanager.
--
https://code.launchpad.net/~zorba-coders/zorba/bug1064978/+merge/150696
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
