Revision: 75919
http://sourceforge.net/p/brlcad/code/75919
Author: starseeker
Date: 2020-05-25 17:19:38 +0000 (Mon, 25 May 2020)
Log Message:
-----------
Turn back on the remaining tests.
Modified Paths:
--------------
brlcad/branches/bioh/regress/CMakeLists.txt
brlcad/branches/bioh/regress/gchecker/regress-gchecker.cmake.in
brlcad/branches/bioh/regress/ged/CMakeLists.txt
brlcad/branches/bioh/regress/repository/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/bioh/regress/repository/regress-repository.cmake.in
Removed Paths:
-------------
brlcad/branches/bioh/regress/repository/regress-repository.cmake
Modified: brlcad/branches/bioh/regress/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/CMakeLists.txt 2020-05-25 16:47:10 UTC (rev
75918)
+++ brlcad/branches/bioh/regress/CMakeLists.txt 2020-05-25 17:19:38 UTC (rev
75919)
@@ -49,7 +49,7 @@
add_subdirectory(licenses)
# Repository check
-#add_subdirectory(repository)
+add_subdirectory(repository)
if(SH_EXEC)
Modified: brlcad/branches/bioh/regress/gchecker/regress-gchecker.cmake.in
===================================================================
--- brlcad/branches/bioh/regress/gchecker/regress-gchecker.cmake.in
2020-05-25 16:47:10 UTC (rev 75918)
+++ brlcad/branches/bioh/regress/gchecker/regress-gchecker.cmake.in
2020-05-25 17:19:38 UTC (rev 75919)
@@ -2,7 +2,7 @@
set(CBDIR "@CMAKE_CURRENT_BINARY_DIR@")
set(CSDIR "@CMAKE_CURRENT_SOURCE_DIR@")
set(GCHECKER_CF "@GCHECKER_CLEAN_FILE@")
-set(LOGFILE "${LOG_FILE}")
+set(LOGFILE "@LOG_FILE@")
file(WRITE "${LOGFILE}" "Starting gchecker test run\n")
Modified: brlcad/branches/bioh/regress/ged/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/ged/CMakeLists.txt 2020-05-25 16:47:10 UTC
(rev 75918)
+++ brlcad/branches/bioh/regress/ged/CMakeLists.txt 2020-05-25 17:19:38 UTC
(rev 75919)
@@ -9,6 +9,7 @@
)
BRLCAD_ADDEXEC(regress_mater mater.c libged TEST_USESDATA)
+target_compile_definitions(regress_mater PUBLIC BRLCADBUILD HAVE_CONFIG_H)
BRLCAD_REGRESSION_TEST(regress-ged_mater "regress_mater;density_DATAFILES_cp"
EXEC regress_mater)
Modified: brlcad/branches/bioh/regress/repository/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/repository/CMakeLists.txt 2020-05-25
16:47:10 UTC (rev 75918)
+++ brlcad/branches/bioh/regress/repository/CMakeLists.txt 2020-05-25
17:19:38 UTC (rev 75919)
@@ -3,8 +3,10 @@
${BRLCAD_SOURCE_DIR}/include
)
-add_executable(repocheck repocheck.cpp)
-target_link_libraries(repocheck libbu ${CMAKE_THREAD_LIBS_INIT})
+
+# Build a scanner to check the repository for various problems
+BRLCAD_ADDEXEC(repocheck repocheck.cpp "libbu;${CMAKE_THREAD_LIBS_INIT}" TEST)
+target_compile_definitions(repocheck PUBLIC BRLCADBUILD HAVE_CONFIG_H)
if (O3_COMPILER_FLAG)
# This check benefits greatly from optimization. If we have the O3 flag, use
# it - whether or not the standard build settings would add it.
@@ -12,28 +14,16 @@
endif (O3_COMPILER_FLAG)
set_target_properties(repocheck PROPERTIES FOLDER "BRL-CAD Regression
Tests/repository")
+# Define the actual regression test
set(ALL_FILES_LIST "${BRLCAD_BINARY_DIR}/cmakefiles.cmake")
+set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/regress-repository.log")
+BRLCAD_REGRESSION_TEST(regress-repository "repocheck" EXEC repocheck)
+DISTCLEAN(${LOG_FILE})
-add_test(NAME regress-repository
- COMMAND "${CMAKE_COMMAND}"
- -DRCHECK_EXEC=$<TARGET_FILE:repocheck>
- -DL_FILE=${LOG_FILE} -DS_FILE=${STAMP_FILE} -DF_LIST=${ALL_FILES_LIST}
- -DB_DIR=${BRLCAD_SOURCE_DIR}
- -P "${CMAKE_CURRENT_SOURCE_DIR}/regress-repository.cmake"
- )
-
-if (CMAKE_CONFIGURATION_TYPES)
- add_custom_target(regress-repository COMMAND ${CMAKE_CTEST_COMMAND} -C
${CMAKE_CFG_INTDIR} -R ^regress-repository --output-on-failure)
-else (CMAKE_CONFIGURATION_TYPES)
- add_custom_target(regress-repository COMMAND ${CMAKE_CTEST_COMMAND} -R
^regress-repository --output-on-failure)
-endif (CMAKE_CONFIGURATION_TYPES)
-
-Add_Regression_Test(repository "repocheck")
-
CMAKEFILES(
CMakeLists.txt
repocheck.cpp
- regress-repository.cmake
+ regress-repository.cmake.in
)
# Local Variables:
Deleted: brlcad/branches/bioh/regress/repository/regress-repository.cmake
===================================================================
--- brlcad/branches/bioh/regress/repository/regress-repository.cmake
2020-05-25 16:47:10 UTC (rev 75918)
+++ brlcad/branches/bioh/regress/repository/regress-repository.cmake
2020-05-25 17:19:38 UTC (rev 75919)
@@ -1,23 +0,0 @@
-string(REPLACE "\\" "" REPOSITORY_CHECK_EXEC "${RCHECK_EXEC}")
-string(REPLACE "\\" "" FILES_LIST "${F_LIST}")
-string(REPLACE "\\" "" B_SOURCE_DIR "${B_DIR}")
-
-message("Running repository check:\n${REPOSITORY_CHECK_EXEC}
${REPOSITORY_FILE_SET} ${FILES_LIST} \"${B_SOURCE_DIR}\"\n")
-message("Processing...")
-execute_process(
- COMMAND "${REPOSITORY_CHECK_EXEC}" "${FILES_LIST}" "${B_SOURCE_DIR}"
RESULT_VARIABLE repository_result
- OUTPUT_VARIABLE repository_log ERROR_VARIABLE repository_log
- )
-message("Processing... done.")
-
-if(repository_result)
- message("${repository_log}\n")
- message(FATAL_ERROR "[repository check] failed.\n")
-endif(repository_result)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
Copied: brlcad/branches/bioh/regress/repository/regress-repository.cmake.in
(from rev 75918,
brlcad/branches/bioh/regress/repository/regress-repository.cmake)
===================================================================
--- brlcad/branches/bioh/regress/repository/regress-repository.cmake.in
(rev 0)
+++ brlcad/branches/bioh/regress/repository/regress-repository.cmake.in
2020-05-25 17:19:38 UTC (rev 75919)
@@ -0,0 +1,21 @@
+string(REPLACE "\\" "" REPOSITORY_CHECK_EXEC "${EXEC}")
+set(FILES_LIST "@ALL_FILES_LIST@")
+set(B_SOURCE_DIR "@BRLCAD_SOURCE_DIR@")
+set(LOGFILE "@LOG_FILE@")
+
+file(WRITE ${LOGFILE} "Running repository check:\n${REPOSITORY_CHECK_EXEC}
${REPOSITORY_FILE_SET} ${FILES_LIST} \"${B_SOURCE_DIR}\"\n")
+execute_process(
+ COMMAND "${REPOSITORY_CHECK_EXEC}" "${FILES_LIST}" "${B_SOURCE_DIR}"
+ RESULT_VARIABLE repository_result OUTPUT_VARIABLE repository_log
ERROR_VARIABLE repository_log
+ )
+if(repository_result)
+ file(APPEND ${LOGFILE} "${repository_log}\n")
+ message(FATAL_ERROR "[repository check] Failure: ${license_result}\n")
+endif(repository_result)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
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
