Revision: 75887
http://sourceforge.net/p/brlcad/code/75887
Author: starseeker
Date: 2020-05-22 02:43:58 +0000 (Fri, 22 May 2020)
Log Message:
-----------
At least with that approach, fixtures doesn't reliably prepare all the
necessary inputs (and a lot of build processes trying to build the same
dependencies behind the various executables slows things down.
Modified Paths:
--------------
brlcad/branches/mktest/CMakeLists.txt
brlcad/branches/mktest/misc/CMake/BRLCAD_Targets.cmake
brlcad/branches/mktest/src/libbu/tests/CMakeLists.txt
brlcad/branches/mktest/src/libbu/tests/dylib/CMakeLists.txt
Modified: brlcad/branches/mktest/CMakeLists.txt
===================================================================
--- brlcad/branches/mktest/CMakeLists.txt 2020-05-21 19:59:33 UTC (rev
75886)
+++ brlcad/branches/mktest/CMakeLists.txt 2020-05-22 02:43:58 UTC (rev
75887)
@@ -79,7 +79,7 @@
# BRL-CAD software package.
# Minimum required version of CMake
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.1.3)
# set CMake project name
project(BRLCAD)
@@ -544,8 +544,6 @@
set_target_properties(unit PROPERTIES FOLDER "BRL-CAD Validation Testing")
-
-
#-----------------------------------------------------------------------------
# we wrap the CMake add_test() function in order to automatically
# set up test dependencies for the 'unit' and 'check' test targets.
#
@@ -656,22 +654,16 @@
endif ("${cnt}" GREATER 0)
# add test to unit and check targets
- if (NOT "${test_name}" MATCHES ^regress- AND NOT "${test_prog}" MATCHES
^regress- AND NOT "${test_name}" MATCHES ^slow- AND NOT "${test_name}" STREQUAL
"benchmark" AND NOT "${test_name}" MATCHES ^NOTE: AND NOT "${test_prog}"
MATCHES cmake)
+ if (NOT "${test_name}" MATCHES ^regress- AND NOT "${test_prog}" MATCHES
^regress- AND NOT "${test_name}" MATCHES ^slow- AND NOT "${test_name}" STREQUAL
"benchmark" AND NOT "${test_name}" MATCHES ^NOTE:)
add_dependencies(unit ${test_prog})
add_dependencies(check ${test_prog})
- endif (NOT "${test_name}" MATCHES ^regress- AND NOT "${test_prog}" MATCHES
^regress- AND NOT "${test_name}" MATCHES ^slow- AND NOT "${test_name}" STREQUAL
"benchmark" AND NOT "${test_name}" MATCHES ^NOTE: AND NOT "${test_prog}"
MATCHES cmake)
+ endif (NOT "${test_name}" MATCHES ^regress- AND NOT "${test_prog}" MATCHES
^regress- AND NOT "${test_name}" MATCHES ^slow- AND NOT "${test_name}" STREQUAL
"benchmark" AND NOT "${test_name}" MATCHES ^NOTE:)
- # If the program to be run has an associated setup test, add this test to
the FIXTURES group
- # associated with that executable so it gets the setup requirement
- if (TEST ${test_prog}_setup)
- set_tests_properties(${test_name} PROPERTIES FIXTURES_REQUIRED
${test_prog}_test_fixtures)
- endif (TEST ${test_prog}_setup)
+ endfunction(add_test NAME test_name COMMAND test_prog)
+endif(NOT BRLCAD_IS_SUBBUILD)
- endfunction(add_test)
-endif(NOT BRLCAD_IS_SUBBUILD)
-
#---------------------------------------------------------------------
# Load macros that will be used to define the BRL-CAD
# build logic
Modified: brlcad/branches/mktest/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/branches/mktest/misc/CMake/BRLCAD_Targets.cmake 2020-05-21
19:59:33 UTC (rev 75886)
+++ brlcad/branches/mktest/misc/CMake/BRLCAD_Targets.cmake 2020-05-22
02:43:58 UTC (rev 75887)
@@ -426,11 +426,6 @@
endif(E_FOLDER)
set_target_properties(${execname} PROPERTIES FOLDER "BRL-CAD
Executables${SUBFOLDER}")
- # If this is a test executable, set up an associated FIXTURES test
- if (NOT TEST ${execname}_setup)
- add_test(NAME ${execname}_setup COMMAND "${CMAKE_COMMAND}" --build
"${CMAKE_BINARY_DIR}" --config "$<CONFIG>" --target ${execname})
- set_tests_properties(${execname}_setup PROPERTIES FIXTURES_SETUP
${execname}_test_fixtures)
- endif (NOT TEST ${execname}_setup)
endfunction(BRLCAD_ADDEXEC execname srcslist libslist)
Modified: brlcad/branches/mktest/src/libbu/tests/CMakeLists.txt
===================================================================
--- brlcad/branches/mktest/src/libbu/tests/CMakeLists.txt 2020-05-21
19:59:33 UTC (rev 75886)
+++ brlcad/branches/mktest/src/libbu/tests/CMakeLists.txt 2020-05-22
02:43:58 UTC (rev 75887)
@@ -250,6 +250,7 @@
# bu_progname testing #
###############################
BRLCAD_ADDEXEC(bu_progname progname.c libbu TEST)
+add_dependencies(bu_test bu_progname)
add_test(NAME bu_progname_tests COMMAND bu_progname)
#
@@ -521,6 +522,7 @@
add_test(NAME bu_vls_incr_16 COMMAND bu_test vls_incr "test" 0
"0:0:0:0:-" 1 "test-1")
BRLCAD_ADDEXEC(bu_vls_incr_uniq vls_incr_uniq.cpp libbu TEST)
+add_dependencies(bu_test bu_vls_incr_uniq)
add_test(NAME bu_vls_incr_uniq_1 COMMAND bu_vls_incr_uniq "test.r1"
"test.r3")
add_test(NAME bu_vls_incr_uniq_2 COMMAND bu_vls_incr_uniq "test.r2"
"test.r3")
@@ -646,6 +648,7 @@
# *********** hash.c tests ************
#
BRLCAD_ADDEXEC(bu_hash hash.cpp libbu TEST)
+add_dependencies(bu_test bu_hash)
add_test(NAME bu_hash_noop COMMAND bu_hash 0)
add_test(NAME bu_hash_one_entry COMMAND bu_hash 1)
add_test(NAME bu_hash_lorem_ipsum COMMAND bu_hash 2)
@@ -704,6 +707,7 @@
# dependency of bu_test to make sure it is present when
# bu_test runs its process tests
BRLCAD_ADDEXEC(bu_subprocess subprocess.cpp libbu TEST)
+add_dependencies(bu_test bu_subprocess)
add_test(NAME bu_process_basic COMMAND bu_test process
"$<TARGET_FILE:bu_subprocess>" basic)
add_test(NAME bu_process_abort COMMAND bu_test process
"$<TARGET_FILE:bu_subprocess>" abort)
Modified: brlcad/branches/mktest/src/libbu/tests/dylib/CMakeLists.txt
===================================================================
--- brlcad/branches/mktest/src/libbu/tests/dylib/CMakeLists.txt 2020-05-21
19:59:33 UTC (rev 75886)
+++ brlcad/branches/mktest/src/libbu/tests/dylib/CMakeLists.txt 2020-05-22
02:43:58 UTC (rev 75887)
@@ -40,7 +40,8 @@
target_link_libraries(libdylib libbu)
set_target_properties(libdylib PROPERTIES FOLDER "BRL-CAD Executables/Test
Programs/dylib")
-BRLCAD_ADDEXEC(bu_dylib run.c "libdylib;libbu" TEST_USESDATA)
+add_executable(bu_dylib run.c)
+target_link_libraries(bu_dylib libdylib libbu)
if (CPP_DLL_DEFINES)
set_property(TARGET bu_dylib APPEND PROPERTY COMPILE_DEFINITIONS
BU_DYLIB_DLL_IMPORTS)
endif (CPP_DLL_DEFINES)
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
