Merge lp:~zorba-coders/zorba/general-tree-ids into lp:zorba

[Ghislain Fourny]

Allowing general tree IDs (containing hexadecimal digits and dash) in structural URIs (test).

Allowing general tree IDs in structural URIs (test).

[Markos Zaharioudakis (markos-za)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/general-tree-ids-2012-04-27T19-03-49.707Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/general-tree-ids into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job general-tree-ids-2012-04-27T19-03-49.707Z is finished.
  The final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/general-tree-ids-2012-05-04T14-25-58.202Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/general-tree-ids into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job general-tree-ids-2012-05-04T14-25-58.202Z is finished.
  The final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/general-tree-ids-2012-05-09T15-15-01.982Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job general-tree-ids-2012-05-09T15-15-01.982Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 3 Pending.

[Matthias Brantner (matthias-brantner)]

review: Approve

[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/general-tree-ids-2012-05-16T19-14-17.47Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job general-tree-ids-2012-05-16T19-14-17.47Z is finished. The final status was:

All tests succeeded!

=== modified file 'test/rbkt/Queries/zorba/nodes/position_4.xq'
--- test/rbkt/Queries/zorba/nodes/position_4.xq	2012-05-03 12:31:51 +0000
+++ test/rbkt/Queries/zorba/nodes/position_4.xq	2012-05-09 15:13:22 +0000
@@ -2,7 +2,7 @@
 
 declare function local:get-ordpath($struct)
 {
-replace($struct,'^zorba:\d*\.\d*\.\d*\.','np:')
+replace($struct,'^zorba:\d*\.[0-9a-fA-F\-]*\.\d*\.','np:')
 };
 
 declare function local:test-generated-ordpath($testa,$testb)

=== modified file 'test/rbkt/Queries/zorba/nodes/position_4_parsed.xq'
--- test/rbkt/Queries/zorba/nodes/position_4_parsed.xq	2012-05-03 12:31:51 +0000
+++ test/rbkt/Queries/zorba/nodes/position_4_parsed.xq	2012-05-09 15:13:22 +0000
@@ -2,7 +2,7 @@
 
 declare function local:get-ordpath($struct)
 {
-replace($struct,'^zorba:\d*\.\d*\.\d*\.','np:')
+replace($struct,'^zorba:\d*\.[0-9a-fA-F\-]*\.\d*\.','np:')
 };
 
 declare function local:test-generated-ordpath($testa,$testb)