Zorba

Merge lp:~zorba-coders/zorba/move-test-iterplan into lp:zorba

  1. move-test-iterplan
  2. Merge into trunk
Proposed by Chris Hillery
Status: Merged
Merged at revision: 11630
Proposed branch: lp:~zorba-coders/zorba/move-test-iterplan
Merge into: lp:zorba
Diff against target: 147 lines (+15/-32)
7 files modified
test/CMakeLists.txt (+1/-5)
test/iterplans/CMakeLists.txt (+8/-2)
test/iterplans/iterscript.cmake (+3/-3)
test/iterplans/itertest.xq.in (+1/-1)
test/iterplans/update_iter_plans (+2/-2)
test/rbkt/CMakeLists.txt (+0/-5)
test/rbkt/ExpCompilerResults/CMakeLists.txt (+0/-14)
To merge this branch: bzr merge lp:~zorba-coders/zorba/move-test-iterplan
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Chris Hillery Approve
Review via email: mp+174120@code.launchpad.net

Commit message

Moved iterplan tests and tools under test/iterplan.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

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

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120 :
Votes: {'Approve': 1}

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

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120

Stage "CommitZorba" failed.

Check console output at http://jenkins.lambda.nu/job/CommitZorba/22/console to view the results.

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

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

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

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

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

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120 :
Votes: {'Approve': 1}

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

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120

Stage "CommitZorba" failed.

Check console output at http://jenkins.lambda.nu/job/CommitZorba/101/console to view the results.

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

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120 :
Votes: {'Approve': 1}

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

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120

Stage "CommitZorba" failed.

Check console output at http://jenkins.lambda.nu/job/CommitZorba/102/console to view the results.

lp:~zorba-coders/zorba/move-test-iterplan updated
11550. By Chris Hillery

Merge from trunk.

Revision history for this message
Juan Zacarias (juan457) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

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

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/CMakeLists.txt'
2--- test/CMakeLists.txt 2013-05-16 08:22:46 +0000
3+++ test/CMakeLists.txt 2013-09-18 19:15:10 +0000
4@@ -30,6 +30,7 @@
5 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/driver)
6 ADD_SUBDIRECTORY(driver)
7 ADD_SUBDIRECTORY(api)
8+ADD_SUBDIRECTORY(iterplans)
9 ADD_SUBDIRECTORY(rbkt)
10 ADD_SUBDIRECTORY(extern)
11
12@@ -42,9 +43,4 @@
13 INSTALL(DIRECTORY fots_driver
14 DESTINATION share/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
15
16-#
17-# apitest
18-#
19-ZORBA_GENERATE_EXE("apitest" "apitest.cpp" "" "" "")
20-
21 #ZORBA_GENERATE_EXE("ordpath_test" "test_ordpath.cpp" "" "" "")
22
23=== added directory 'test/iterplans'
24=== renamed file 'test/rbkt/ExpCompilerResults/IterPlan/CMakeLists.txt' => 'test/iterplans/CMakeLists.txt'
25--- test/rbkt/ExpCompilerResults/IterPlan/CMakeLists.txt 2013-02-07 17:24:36 +0000
26+++ test/iterplans/CMakeLists.txt 2013-09-18 19:15:10 +0000
27@@ -12,6 +12,12 @@
28 # See the License for the specific language governing permissions and
29 # limitations under the License.
30
31+# configure itertest
32+CONFIGURE_FILE(itertest.xq.in ${CMAKE_CURRENT_BINARY_DIR}/itertest.xq)
33+
34+# apitest
35+ZORBA_GENERATE_EXE("apitest" "apitest.cpp" "" "" "")
36+
37 MESSAGE (STATUS "Adding iterator plan tests")
38 FILE (GLOB_RECURSE TESTFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.iter)
39
40@@ -21,9 +27,9 @@
41 SET(SUFFIX "_${ZORBA_STORE_NAME}")
42 ENDIF (NOT ${ZORBA_STORE_NAME} STREQUAL "simplestore")
43 IF (WIN32)
44- SET(APITEST_PATH ${CMAKE_BINARY_DIR}/test/apitest${SUFFIX}.bat)
45+ SET(APITEST_PATH ${CMAKE_CURRENT_BINARY_DIR}/apitest${SUFFIX}.bat)
46 ELSE()
47- SET(APITEST_PATH ${CMAKE_BINARY_DIR}/test/apitest${SUFFIX})
48+ SET(APITEST_PATH ${CMAKE_CURRENT_BINARY_DIR}/apitest${SUFFIX})
49 ENDIF()
50
51 FOREACH (TESTFILE ${TESTFILES})
52
53=== renamed file 'test/apitest.cpp' => 'test/iterplans/apitest.cpp'
54=== renamed file 'test/rbkt/ExpCompilerResults/IterPlan/iterscript.cmake' => 'test/iterplans/iterscript.cmake'
55--- test/rbkt/ExpCompilerResults/IterPlan/iterscript.cmake 2013-02-07 17:24:36 +0000
56+++ test/iterplans/iterscript.cmake 2013-09-18 19:15:10 +0000
57@@ -12,13 +12,13 @@
58 # See the License for the specific language governing permissions and
59 # limitations under the License.
60
61-#$TESTFILE is a filepath relative to the test/rbkt/ExpCompilerResults/IterPlan dir.
62+#$TESTFILE is a filepath relative to the test/iterplans dir.
63
64 STRING (LENGTH ${TESTFILE} testfile_length)
65 MATH (EXPR testfile_length "${testfile_length} - 5")
66 STRING (SUBSTRING ${TESTFILE} 0 ${testfile_length} testname)
67
68-SET (APITEST_OUT_FILEPATH ${CMAKE_ZORBA_BINARY_DIR}/test/rbkt/CompilerResults/IterPlan/${testname}.spec)
69+SET (APITEST_OUT_FILEPATH ${CMAKE_ZORBA_BINARY_DIR}/test/iterplans/${testname}.spec)
70
71 GET_FILENAME_COMPONENT (APITEST_OUT_DIRPATH ${APITEST_OUT_FILEPATH} PATH)
72
73@@ -34,7 +34,7 @@
74 OUTPUT_FILE ${APITEST_OUT_FILEPATH}
75 )
76
77-FILE (TO_NATIVE_PATH ${CMAKE_ZORBA_BINARY_DIR}/test/rbkt/itertest.xq itertest_xq_path)
78+FILE (TO_NATIVE_PATH ${CMAKE_ZORBA_BINARY_DIR}/test/iterplans/itertest.xq itertest_xq_path)
79
80 EXECUTE_PROCESS (
81 COMMAND
82
83=== renamed file 'test/rbkt/itertest.xq.in' => 'test/iterplans/itertest.xq.in'
84--- test/rbkt/itertest.xq.in 2013-02-07 17:24:36 +0000
85+++ test/iterplans/itertest.xq.in 2013-09-18 19:15:10 +0000
86@@ -28,7 +28,7 @@
87 declare variable $result-filepath external;
88
89 variable $expected-filepath :=
90-fn:concat($source-dir, '/test/rbkt/ExpCompilerResults/IterPlan/', $testname, '.iter');
91+fn:concat($source-dir, '/test/iterplans/', $testname, '.iter');
92
93 variable $query-filepath :=
94 fn:concat($source-dir, '/test/rbkt/Queries/', $testname, '.xq');
95
96=== renamed file 'test/rbkt/update_iter_plans' => 'test/iterplans/update_iter_plans'
97--- test/rbkt/update_iter_plans 2013-02-07 17:24:36 +0000
98+++ test/iterplans/update_iter_plans 2013-09-18 19:15:10 +0000
99@@ -1,7 +1,7 @@
100 #!/bin/bash
101 BUILDDIR=$1
102 test -e "$BUILDDIR" || { echo "Arguments: BUILD_DIR"; exit 1; }
103-D=$BUILDDIR/test/rbkt/CompilerResults/IterPlan
104+D=$BUILDDIR/test/iterplans
105 for f in `cd $D; find . -name *.iter`; do
106- cp $D/$f `dirname $0`/ExpCompilerResults/IterPlan/$f
107+ cp $D/$f `dirname $0`/iterplans/$f
108 done
109
110=== renamed directory 'test/rbkt/ExpCompilerResults/IterPlan/zorba' => 'test/iterplans/zorba'
111=== modified file 'test/rbkt/CMakeLists.txt'
112--- test/rbkt/CMakeLists.txt 2013-05-16 08:22:46 +0000
113+++ test/rbkt/CMakeLists.txt 2013-09-18 19:15:10 +0000
114@@ -12,11 +12,6 @@
115 # See the License for the specific language governing permissions and
116 # limitations under the License.
117
118-ADD_SUBDIRECTORY(ExpCompilerResults)
119-
120-# configure itertest
121-CONFIGURE_FILE(itertest.xq.in ${CMAKE_CURRENT_BINARY_DIR}/itertest.xq)
122-
123 # The NO_CTEST variable can be set to 1 so that CMake does not search
124 # for and add most of the Zorba tests, to speed up building and
125 # compiling the project.
126
127=== removed directory 'test/rbkt/ExpCompilerResults'
128=== removed file 'test/rbkt/ExpCompilerResults/CMakeLists.txt'
129--- test/rbkt/ExpCompilerResults/CMakeLists.txt 2013-02-07 17:24:36 +0000
130+++ test/rbkt/ExpCompilerResults/CMakeLists.txt 1970-01-01 00:00:00 +0000
131@@ -1,14 +0,0 @@
132-# Copyright 2006-2008 The FLWOR Foundation.
133-#
134-# Licensed under the Apache License, Version 2.0 (the "License");
135-# you may not use this file except in compliance with the License.
136-# You may obtain a copy of the License at
137-#
138-# http://www.apache.org/licenses/LICENSE-2.0
139-#
140-# Unless required by applicable law or agreed to in writing, software
141-# distributed under the License is distributed on an "AS IS" BASIS,
142-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
143-# See the License for the specific language governing permissions and
144-# limitations under the License.
145-ADD_SUBDIRECTORY (IterPlan)
146
147=== removed directory 'test/rbkt/ExpCompilerResults/IterPlan'

Subscribers

People subscribed via source and target branches