Revision: 75916
http://sourceforge.net/p/brlcad/code/75916
Author: starseeker
Date: 2020-05-25 04:02:17 +0000 (Mon, 25 May 2020)
Log Message:
-----------
reenable regress gchecker test
Modified Paths:
--------------
brlcad/branches/bioh/regress/CMakeLists.txt
brlcad/branches/bioh/regress/gchecker/CMakeLists.txt
brlcad/branches/bioh/regress/gchecker/regress-gchecker.cmake.in
Modified: brlcad/branches/bioh/regress/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/CMakeLists.txt 2020-05-25 03:18:05 UTC (rev
75915)
+++ brlcad/branches/bioh/regress/CMakeLists.txt 2020-05-25 04:02:17 UTC (rev
75916)
@@ -43,7 +43,7 @@
endif (${HAVE_FUZZER})
# gchecker tests
-#add_subdirectory(gchecker)
+add_subdirectory(gchecker)
# License check
#add_subdirectory(licenses)
Modified: brlcad/branches/bioh/regress/gchecker/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/gchecker/CMakeLists.txt 2020-05-25
03:18:05 UTC (rev 75915)
+++ brlcad/branches/bioh/regress/gchecker/CMakeLists.txt 2020-05-25
04:02:17 UTC (rev 75916)
@@ -1,26 +1,10 @@
-if(CMAKE_CONFIGURATION_TYPES)
- set(cfg_testname "-${CMAKE_CFG_INTDIR}")
-else(CMAKE_CONFIGURATION_TYPES)
- set(cfg_testname "")
-endif(CMAKE_CONFIGURATION_TYPES)
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/regress-gchecker.log")
+set(GCHECKER_CLEAN_FILE
${CMAKE_CURRENT_BINARY_DIR}/gchecker_test.g.ck/ck.gchecker_test.g.overlaps)
-set(GCHECKER_CLEAN_FILES
- gchecker_test.g.ck/ck.gchecker_test.g.overlaps
- gchecker.log
- )
+BRLCAD_REGRESSION_TEST(regress-gchecker "gchecker;mged;gqa;rtcheck" EXEC
gchecker)
-set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/regress${cfg_testname}-gchecker.log")
-set(STAMP_FILE "${CMAKE_CURRENT_BINARY_DIR}/gchecker${cfg_testname}.done")
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/regress-gchecker.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/regress-gchecker.cmake" @ONLY)
-add_custom_command(
- OUTPUT "${STAMP_FILE}"
- COMMAND "${CMAKE_COMMAND}" -P
"${CMAKE_CURRENT_BINARY_DIR}/regress-gchecker.cmake"
- DEPENDS ${depends_list}
- )
-add_test(NAME regress-gchecker COMMAND "${CMAKE_COMMAND}" -P
"${CMAKE_CURRENT_BINARY_DIR}/regress-gchecker.cmake")
-add_custom_target(regress-gchecker DEPENDS gchecker mged gqa rtcheck
"${STAMP_FILE}")
-set_target_properties(regress-gchecker PROPERTIES FOLDER "BRL-CAD Regression
Tests")
-Add_Regression_Test(gchecker "gchecker;mged;gqa;rtcheck")
+DISTCLEAN(${LOG_FILE})
+DISTCLEAN(${GCHECKER_CLEAN_FILES})
CMAKEFILES(
CMakeLists.txt
@@ -27,15 +11,6 @@
gchecker_test.g
)
-DISTCLEAN(
- ${STAMP_FILE}
- ${LOG_FILE}
- ${TARGET_IMAGE}
- )
-foreach(GCF ${GCHECKER_CLEAN_FILES})
- DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/${GCF}")
-endforeach(GCF ${GCHECKER_CLEAN_FILES})
-
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/branches/bioh/regress/gchecker/regress-gchecker.cmake.in
===================================================================
--- brlcad/branches/bioh/regress/gchecker/regress-gchecker.cmake.in
2020-05-25 03:18:05 UTC (rev 75915)
+++ brlcad/branches/bioh/regress/gchecker/regress-gchecker.cmake.in
2020-05-25 04:02:17 UTC (rev 75916)
@@ -1,51 +1,41 @@
+# Values set at CMake configure time
set(CBDIR "@CMAKE_CURRENT_BINARY_DIR@")
set(CSDIR "@CMAKE_CURRENT_SOURCE_DIR@")
-set(DDIR "@DATA_DIR@")
-set(GCHECKER_CF "@GCHECKER_CLEAN_FILES@")
+set(GCHECKER_CF "@GCHECKER_CLEAN_FILE@")
+set(LOGFILE "${LOG_FILE}")
-set(SBDIR "@CMAKE_RUNTIME_OUTPUT_DIRECTORY@")
-set(DBDIR "@CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG@")
-set(RBDIR "@CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE@")
-# Use the mechanism created to allow multiconfig builds to
-# know what the current build type is.
-if(EXISTS "@CMAKE_BINARY_DIR@/CMakeTmp/CURRENT_PATH/Release")
- set(BDIR "${RBDIR}")
- set(test_suffix "-Release")
-elseif(EXISTS "@CMAKE_BINARY_DIR@/CMakeTmp/CURRENT_PATH/Debug")
- set(BDIR "${DBDIR}")
- set(test_suffix "-Debug")
-else(EXISTS "@CMAKE_BINARY_DIR@/CMakeTmp/CURRENT_PATH/Release")
- set(BDIR "${SBDIR}")
- set(test_suffix)
-endif(EXISTS "@CMAKE_BINARY_DIR@/CMakeTmp/CURRENT_PATH/Release")
+file(WRITE "${LOGFILE}" "Starting gchecker test run\n")
-get_filename_component(EXE "@CMAKE_COMMAND@" EXT)
-set(GCHECKER "${BDIR}/gchecker${EXE}")
+# The executable locations aren't know at CMake configure time, so one of them
+# is passed in via the EXEC variable at runtime. De-quote it and assign it to
+# the appropriate variable.
+string(REPLACE "\\" "" GCHECKER "${EXEC}")
+if (NOT EXISTS "${GCHECKER}")
+ file(WRITE "${LOGFILE}" "regress_gchecker not found at location
\"${GCHECKER}\" - aborting\n")
+ message(FATAL_ERROR "Unable to find regress_gchecker, aborting.\nSee
${LOGFILE} for more details.")
+endif (NOT EXISTS "${GCHECKER}")
# Clean up in case we've run before
-foreach(GCF ${GCHECKER_CF})
- execute_process(COMMAND "@CMAKE_COMMAND@" -E remove -f "${CBDIR}/${GCF}")
-endforeach(GCF ${GCHECKER_CF})
+execute_process(COMMAND "@CMAKE_COMMAND@" -E remove -f "${GCHECKER_CF}")
execute_process(COMMAND "@CMAKE_COMMAND@" -E remove_directory
"${CBDIR}/gchecker_test.g.ck")
-file(WRITE "${CBDIR}/gchecker.log" "Running gchecker:\n${GCHECKER}
${CSDIR}/gchecker_test.g\n")
+file(APPEND "${LOGFILE}" "Running gchecker:\n${GCHECKER}
${CSDIR}/gchecker_test.g\n")
execute_process(
- COMMAND "${GCHECKER}" "${CSDIR}/gchecker_test.g" RESULT_VARIABLE
gchecker_result
- OUTPUT_VARIABLE gchecker_log ERROR_VARIABLE gchecker_log
+ COMMAND "${GCHECKER}" "${CSDIR}/gchecker_test.g"
+ RESULT_VARIABLE gchecker_result OUTPUT_VARIABLE gchecker_log ERROR_VARIABLE
gchecker_log
WORKING_DIRECTORY ${CBDIR}
)
-file(APPEND "${CBDIR}/gchecker.log" "${gchecker_log}")
+file(APPEND "${LOGFILE}" "${gchecker_log}")
set(gchecker_log)
if(NOT EXISTS "${CBDIR}/gchecker_test.g.ck/ck.gchecker_test.g.overlaps")
+ file(APPEND "${LOGFILE}" "\n\nError: return code ${gchecker_result}")
message(FATAL_ERROR "${GCHECKER} failed to process gchecker_test.g,
aborting.\nSee ${CBDIR}/gchecker.log for more details.")
endif(NOT EXISTS "${CBDIR}/gchecker_test.g.ck/ck.gchecker_test.g.overlaps")
if(gchecker_result)
- file(APPEND "${CBDIR}/gchecker.log" "\n\nError: return code
${gchecker_result}")
+ file(APPEND "${LOGFILE}" "\n\nError: return code ${gchecker_result}")
message(FATAL_ERROR "[gchecker] Failure, see ${CBDIR}/gchecker.log for more
info.\n")
-else(gchecker_result)
- execute_process(COMMAND "@CMAKE_COMMAND@" -E touch
"@CMAKE_CURRENT_BINARY_DIR@/gchecker${test_suffix}.done")
endif(gchecker_result)
# Local Variables:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
