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

[Markos Zaharioudakis]

fots driver fix: wrap external variable values in ()

fots driver fix: wrap external variable values in ()

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-04-25T21-47-57.438Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

[lp:~zorba-coders/zorba/markos-scratch]

11077. By Markos Zaharioudakis on 2013-04-25

merge from trunk

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-04-25T22-56-41.947Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

All tests succeeded!

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-04-25 21:13:54 +0000
+++ test/fots/CMakeLists.txt	2013-04-25 22:52:30 +0000
@@ -134,6 +134,7 @@
 EXPECTED_FOTS_FAILURE (DISPUTED prod-OrderByClause orderBy20 21619)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-OrderByClause orderBy21 21619)
 EXPECTED_FOTS_FAILURE (DISPUTED misc-CombinedErrorCodes XQST0085 21730)
+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.
@@ -411,8 +412,6 @@
 EXPECTED_FOTS_FAILURE (prod-ValidateExpr validate-as-106 0)
 EXPECTED_FOTS_FAILURE (prod-VarDecl.external K2-ExternalVariablesWithout-18 0)
 EXPECTED_FOTS_FAILURE (prod-VarDecl.external K2-ExternalVariablesWith-22 0)
-EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-003a 0)
-EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-006b 0)
 EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-016a 0)
 EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-016b 0)
 EXPECTED_FOTS_FAILURE (prod-VersionDecl VersionDecl-v1-processor-and-v3-query 0)
 
=== modified file 'test/fots_driver/environment.xq'
--- test/fots_driver/environment.xq	2013-04-17 19:11:53 +0000
+++ test/fots_driver/environment.xq	2013-04-25 22:52:30 +0000
@@ -490,7 +490,7 @@
                            ends-with($select, "'") and
                            exists($file))
                        then  concat('"', resolve-uri($file, $envBaseURI), '"')
-                       else $select
+                       else concat("(", $select, ")")
       let $varName := $param/@name
       where (exists($select) and exists($param[@declared eq "true"]))
       return