tests were broken because macro name changed

mpictor · mpictor · commit 5c021b2b7fb5 · 2014-03-01T11:53:30.000-05:00
make two variables CACHE INTERNAL so that their values are available in other scopes (i.e. in test dirs)
diff --git a/cmake/SC_CXX_schema_macros.cmake b/cmake/SC_CXX_schema_macros.cmake
@@ -24,7 +24,7 @@ macro(P21_TESTS sfile)
   endforeach()
 endmacro(P21_TESTS sfile)
 
-#
+# create p21read_sdai_*, lazy_sdai_*, any exes listed in SC_SDAI_ADDITIONAL_EXES_SRCS
 macro(SCHEMA_EXES)
   RELATIVE_PATH_TO_TOPLEVEL(${CMAKE_CURRENT_SOURCE_DIR} RELATIVE_PATH_COMPONENT)
   SC_ADDEXEC(p21read_${PROJECT_NAME} "${RELATIVE_PATH_COMPONENT}/src/test/p21read/p21read.cc" "${PROJECT_NAME};stepdai;stepcore;stepeditor;steputils;base" "TESTABLE")
@@ -85,13 +85,11 @@ macro(SCHEMA_TARGETS expFile schemaName sourceFiles)
   # to divert stdout, stderr in cmake except via execute_process
   add_custom_command(OUTPUT ${sourceFiles}
     COMMAND ${CMAKE_COMMAND} -DEXE=\"$<TARGET_FILE:exp2cxx>\"  -DEXP=\"${expFile}\"
-    -DONESHOT=\"${SC_GENERATE_CXX_ONESHOT}\"
-    -DSDIR=\"${CMAKE_CURRENT_LIST_DIR}\"
+    -DONESHOT=\"${SC_GENERATE_CXX_ONESHOT}\" -DSDIR=\"${CMAKE_CURRENT_LIST_DIR}\"
     -P ${SC_CMAKE_DIR}/SC_Run_exp2cxx.cmake
     WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
     COMMENT "[exp2cxx] Generating ${${PROJECT_NAME}_file_count} C++ files for ${PROJECT_NAME}."
   )
-  # will include_directories behave as desired in a macro?
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}         ${SC_SOURCE_DIR}/src/cldai          ${SC_SOURCE_DIR}/src/cleditor
     ${SC_SOURCE_DIR}/src/clutils        ${SC_SOURCE_DIR}/src/clstepcore     ${SC_SOURCE_DIR}/src/base
@@ -101,6 +99,7 @@ macro(SCHEMA_TARGETS expFile schemaName sourceFiles)
   SC_ADDLIB(${PROJECT_NAME} "${sourceFiles}" "stepdai;stepcore;stepeditor;steputils;base" "TESTABLE")
   add_dependencies(${PROJECT_NAME} generate_cpp_${PROJECT_NAME})
 
+  SCHEMA_EXES()
   SCHEMA_TESTS()
   P21_TESTS(${expFile})
   # TODO add test to verify that schema scanner output matches fedex_plus output
diff --git a/cmake/schema_scanner/schemaScanner.cmake b/cmake/schema_scanner/schemaScanner.cmake
@@ -17,8 +17,8 @@
 # SCANNER_BUILD_DIR: location scanner is built
 
 set(SCANNER_SRC_DIR ${SC_CMAKE_DIR}/schema_scanner)
-set(SCANNER_BUILD_DIR ${SC_BINARY_DIR}/schema_scanner)
-set(SCANNER_OUT_DIR ${SC_BINARY_DIR}/bin)
+set(SCANNER_BUILD_DIR ${SC_BINARY_DIR}/schema_scanner CACHE INTERNAL "location for scanner build, config files (copied schemas)")
+set(SCANNER_OUT_DIR ${SC_BINARY_DIR}/bin CACHE INTERNAL "location for schema_scanner executable")
 
 #write a cmake file for the cache. the alternative is a very long
 # command line - and the command line can't have newlines in it
@@ -76,7 +76,7 @@ macro(SCHEMA_CMLIST SCHEMA_FILE)
                 )
   if(NOT "${_ss_stat}" STREQUAL "0")
     #check size of output, put in file if large?
-    message(FATAL_ERROR "Schema scan exited with error code ${_ss_stat}. stdout:\n${_ss_out}\nstderr:\n${_ss_err}")
+    message(FATAL_ERROR "Schema scan for '${SCHEMA_FILE}'\nexited with error code '${_ss_stat}'\nstdout:\n${_ss_out}\nstderr:\n${_ss_err}\n")
   endif(NOT "${_ss_stat}" STREQUAL "0")
   # scanner output format: each line contains an absolute path. each path is a dir containing a CMakeLists for one schema
   # there will usually be a single line of output, but it is not illegal for multiple schemas to exist in one .exp file
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
@@ -1,5 +1,14 @@
 # To build one or more schemas, configure with
 # 'cmake -DSC_BUILD_SCHEMAS="path/to/schema.exp;path/to/schema2.exp"
+# you can specify a schema in 3 ways:
+#  * path relative to build dir
+#  * path relative to sc/data (this dir)
+#  * absolute path
+#
+# cmake goes through the above options in order until it finds one
+# that exists. if ${path} is a dir, cmake expects to find a single
+# .exp file inside, which it uses. otherwise, ${path} is assumed to
+# be an express file.
 
 if(NOT "${SC_BUILD_SCHEMAS}" STREQUAL "")
   include(${SC_CMAKE_DIR}/schema_scanner/schemaScanner.cmake)
diff --git a/test/cpp/schema_specific/CMakeLists.txt b/test/cpp/schema_specific/CMakeLists.txt
@@ -37,8 +37,8 @@ endfunction( add_schema_dependent_test name sdai_lib exe_args )
 #if you need a schema that won't be built automatically (i.e. not in sc/data), put it in here
 #temporarily disabling testing ensures that the schema will be built before these tests run
 set(SC_ENABLE_TESTING OFF)
-BUILD_A_SCHEMA( ${SC_SOURCE_DIR}/test/unitary_schemas/array_bounds_expr.exp )
-BUILD_A_SCHEMA( ${SC_SOURCE_DIR}/test/unitary_schemas/inverse_attr.exp )
+SCHEMA_CMLIST(${SC_SOURCE_DIR}/test/unitary_schemas/array_bounds_expr.exp)
+SCHEMA_CMLIST(${SC_SOURCE_DIR}/test/unitary_schemas/inverse_attr.exp)
 set(SC_ENABLE_TESTING ON)
 
 add_schema_dependent_test( "aggregate_bound_runtime" "array_bounds_expr"
diff --git a/test/p21/CMakeLists.txt b/test/p21/CMakeLists.txt
@@ -84,14 +84,14 @@ set_tests_properties(test_mismatch_schema_name test_missing_and_required_strict
 
 #check for a segmentation fault with selects. the files are a subset of the 210e3 schema and of SurfaceMountFlasher.stp, respectively
 #p21read will report errors with the file, but they don't matter as long as there isn't a segfault.
-BUILD_A_SCHEMA(${SC_SOURCE_DIR}/test/misc/select_segfault_210e3.exp)
+SCHEMA_CMLIST(${SC_SOURCE_DIR}/test/misc/select_segfault_210e3.exp)
 add_test(test_select_segfault ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/p21read_sdai_select_segfault_210e3
   ${CMAKE_CURRENT_SOURCE_DIR}/select_segfault_210e3.stp)
 set_tests_properties(test_select_segfault PROPERTIES DEPENDS build_cpp_sdai_select_segfault_210e3 LABELS exchange_file WILL_FAIL TRUE)
 
 set(mid "multiple_inheritance_derived")
 #schema for multiple inheritance where two attrs with same name are inherited; one is derived
-BUILD_A_SCHEMA(${SC_SOURCE_DIR}/test/unitary_schemas/${mid}.exp)
+SCHEMA_CMLIST(${SC_SOURCE_DIR}/test/unitary_schemas/${mid}.exp)
 
 INSTANCE_TEST(${mid} PASS "A();"                             )
 INSTANCE_TEST(${mid} FAIL "A(*);"                            )
