zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/move-test-iterplan into lp:zorba.

Commit message:
Moved iterplan tests and tools under test/iterplan.

Requested reviews:
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120
-- 
https://code.launchpad.net/~zorba-coders/zorba/move-test-iterplan/+merge/174120
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'test/CMakeLists.txt'
--- test/CMakeLists.txt	2013-05-16 08:22:46 +0000
+++ test/CMakeLists.txt	2013-07-11 06:57:37 +0000
@@ -30,6 +30,7 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/driver)
 ADD_SUBDIRECTORY(driver)
 ADD_SUBDIRECTORY(api)
+ADD_SUBDIRECTORY(iterplans)
 ADD_SUBDIRECTORY(rbkt)
 ADD_SUBDIRECTORY(extern)
 
@@ -42,9 +43,4 @@
 INSTALL(DIRECTORY fots_driver
         DESTINATION share/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
 
-#
-# apitest
-#
-ZORBA_GENERATE_EXE("apitest" "apitest.cpp" "" "" "")
-
 #ZORBA_GENERATE_EXE("ordpath_test" "test_ordpath.cpp" "" "" "")

=== added directory 'test/iterplans'
=== renamed file 'test/rbkt/ExpCompilerResults/IterPlan/CMakeLists.txt' => 'test/iterplans/CMakeLists.txt'
--- test/rbkt/ExpCompilerResults/IterPlan/CMakeLists.txt	2013-02-07 17:24:36 +0000
+++ test/iterplans/CMakeLists.txt	2013-07-11 06:57:37 +0000
@@ -12,6 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# configure itertest
+CONFIGURE_FILE(itertest.xq.in ${CMAKE_CURRENT_BINARY_DIR}/itertest.xq)
+
+# apitest
+ZORBA_GENERATE_EXE("apitest" "apitest.cpp" "" "" "")
+
 MESSAGE (STATUS "Adding iterator plan tests")
 FILE (GLOB_RECURSE TESTFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.iter)
 
@@ -21,9 +27,9 @@
   SET(SUFFIX "_${ZORBA_STORE_NAME}")
 ENDIF (NOT ${ZORBA_STORE_NAME} STREQUAL "simplestore")
 IF (WIN32)
-  SET(APITEST_PATH ${CMAKE_BINARY_DIR}/test/apitest${SUFFIX}.bat)
+  SET(APITEST_PATH ${CMAKE_CURRENT_BINARY_DIR}/apitest${SUFFIX}.bat)
 ELSE()
-  SET(APITEST_PATH ${CMAKE_BINARY_DIR}/test/apitest${SUFFIX})
+  SET(APITEST_PATH ${CMAKE_CURRENT_BINARY_DIR}/apitest${SUFFIX})
 ENDIF()
 
 FOREACH (TESTFILE ${TESTFILES})

=== renamed file 'test/apitest.cpp' => 'test/iterplans/apitest.cpp'
=== renamed file 'test/rbkt/ExpCompilerResults/IterPlan/iterscript.cmake' => 'test/iterplans/iterscript.cmake'
--- test/rbkt/ExpCompilerResults/IterPlan/iterscript.cmake	2013-02-07 17:24:36 +0000
+++ test/iterplans/iterscript.cmake	2013-07-11 06:57:37 +0000
@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#$TESTFILE is a filepath relative to the test/rbkt/ExpCompilerResults/IterPlan dir.
+#$TESTFILE is a filepath relative to the test/iterplans dir.
 
 STRING (LENGTH ${TESTFILE} testfile_length)
 MATH (EXPR testfile_length "${testfile_length} - 5")
 STRING (SUBSTRING ${TESTFILE} 0 ${testfile_length} testname)
     
-SET (APITEST_OUT_FILEPATH ${CMAKE_ZORBA_BINARY_DIR}/test/rbkt/CompilerResults/IterPlan/${testname}.spec)
+SET (APITEST_OUT_FILEPATH ${CMAKE_ZORBA_BINARY_DIR}/test/iterplans/${testname}.spec)
 
 GET_FILENAME_COMPONENT (APITEST_OUT_DIRPATH ${APITEST_OUT_FILEPATH} PATH)
     
@@ -34,7 +34,7 @@
   OUTPUT_FILE ${APITEST_OUT_FILEPATH}
 ) 
     
-FILE (TO_NATIVE_PATH ${CMAKE_ZORBA_BINARY_DIR}/test/rbkt/itertest.xq itertest_xq_path)
+FILE (TO_NATIVE_PATH ${CMAKE_ZORBA_BINARY_DIR}/test/iterplans/itertest.xq itertest_xq_path)
     
 EXECUTE_PROCESS (
   COMMAND

=== renamed file 'test/rbkt/itertest.xq.in' => 'test/iterplans/itertest.xq.in'
--- test/rbkt/itertest.xq.in	2013-02-07 17:24:36 +0000
+++ test/iterplans/itertest.xq.in	2013-07-11 06:57:37 +0000
@@ -28,7 +28,7 @@
 declare variable $result-filepath external;
 
 variable $expected-filepath := 
-fn:concat($source-dir, '/test/rbkt/ExpCompilerResults/IterPlan/', $testname, '.iter');
+fn:concat($source-dir, '/test/iterplans/', $testname, '.iter');
 
 variable $query-filepath := 
 fn:concat($source-dir, '/test/rbkt/Queries/', $testname, '.xq');

=== renamed file 'test/rbkt/update_iter_plans' => 'test/iterplans/update_iter_plans'
--- test/rbkt/update_iter_plans	2013-02-07 17:24:36 +0000
+++ test/iterplans/update_iter_plans	2013-07-11 06:57:37 +0000
@@ -1,7 +1,7 @@
 #!/bin/bash
 BUILDDIR=$1
 test -e "$BUILDDIR" || { echo "Arguments: BUILD_DIR"; exit 1; }
-D=$BUILDDIR/test/rbkt/CompilerResults/IterPlan
+D=$BUILDDIR/test/iterplans
 for f in `cd $D; find . -name *.iter`; do
- cp $D/$f `dirname $0`/ExpCompilerResults/IterPlan/$f
+ cp $D/$f `dirname $0`/iterplans/$f
 done

=== renamed directory 'test/rbkt/ExpCompilerResults/IterPlan/zorba' => 'test/iterplans/zorba'
=== modified file 'test/rbkt/CMakeLists.txt'
--- test/rbkt/CMakeLists.txt	2013-05-16 08:22:46 +0000
+++ test/rbkt/CMakeLists.txt	2013-07-11 06:57:37 +0000
@@ -12,11 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ADD_SUBDIRECTORY(ExpCompilerResults)
-
-# configure itertest
-CONFIGURE_FILE(itertest.xq.in ${CMAKE_CURRENT_BINARY_DIR}/itertest.xq)
-
 # The NO_CTEST variable can be set to 1 so that CMake does not search
 # for and add most of the Zorba tests, to speed up building and
 # compiling the project.

=== removed directory 'test/rbkt/ExpCompilerResults'
=== removed file 'test/rbkt/ExpCompilerResults/CMakeLists.txt'
--- test/rbkt/ExpCompilerResults/CMakeLists.txt	2013-02-07 17:24:36 +0000
+++ test/rbkt/ExpCompilerResults/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-# Copyright 2006-2008 The FLWOR Foundation.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-ADD_SUBDIRECTORY (IterPlan)

=== removed directory 'test/rbkt/ExpCompilerResults/IterPlan'