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

Proposed by Markos Zaharioudakis
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 11077
Merged at revision: 11411
Proposed branch: lp:~zorba-coders/zorba/markos-scratch
Merge into: lp:zorba
Diff against target: 33 lines (+2/-3)
2 files modified
test/fots/CMakeLists.txt (+1/-2)
test/fots_driver/environment.xq (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/markos-scratch
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Review via email: mp+161029@code.launchpad.net

Commit message

fots driver fix: wrap external variable values in ()

Description of the change

fots driver fix: wrap external variable values in ()

To post a comment you must log in.
Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/markos-scratch 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 markos-scratch-2013-04-25T21-47-57.438Z 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

11077. By Markos Zaharioudakis

merge from trunk

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

Validation queue job markos-scratch-2013-04-25T22-56-41.947Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/fots/CMakeLists.txt'
2--- test/fots/CMakeLists.txt 2013-04-25 21:13:54 +0000
3+++ test/fots/CMakeLists.txt 2013-04-25 22:52:30 +0000
4@@ -134,6 +134,7 @@
5 EXPECTED_FOTS_FAILURE (DISPUTED prod-OrderByClause orderBy20 21619)
6 EXPECTED_FOTS_FAILURE (DISPUTED prod-OrderByClause orderBy21 21619)
7 EXPECTED_FOTS_FAILURE (DISPUTED misc-CombinedErrorCodes XQST0085 21730)
8+EXPECTED_FOTS_FAILURE (DISPUTED prod-VarDefaultValue extvardef-006b 21832)
9
10 # Next three possibly unique to old RQ machine, but they need to be
11 # marked for the RQ to pass.
12@@ -411,8 +412,6 @@
13 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validate-as-106 0)
14 EXPECTED_FOTS_FAILURE (prod-VarDecl.external K2-ExternalVariablesWithout-18 0)
15 EXPECTED_FOTS_FAILURE (prod-VarDecl.external K2-ExternalVariablesWith-22 0)
16-EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-003a 0)
17-EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-006b 0)
18 EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-016a 0)
19 EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-016b 0)
20 EXPECTED_FOTS_FAILURE (prod-VersionDecl VersionDecl-v1-processor-and-v3-query 0)
21
22=== modified file 'test/fots_driver/environment.xq'
23--- test/fots_driver/environment.xq 2013-04-17 19:11:53 +0000
24+++ test/fots_driver/environment.xq 2013-04-25 22:52:30 +0000
25@@ -490,7 +490,7 @@
26 ends-with($select, "'") and
27 exists($file))
28 then concat('"', resolve-uri($file, $envBaseURI), '"')
29- else $select
30+ else concat("(", $select, ")")
31 let $varName := $param/@name
32 where (exists($select) and exists($param[@declared eq "true"]))
33 return

Subscribers

People subscribed via source and target branches