CMake: Set the platform and configuration for the tests.

author: Vollstrecker <werner@vollstreckernet.de> 2024-12-05 11:10:23 +0100
committer: Mark Adler <madler@alumni.caltech.edu> 2025-01-31 19:59:10 -0800
commit: 6084c550c310caf265156ea0c33bf6febf58e313 (patch)
tree: 545b47a3868ac670f0d274c7e436076e8a89f232
parent: 1fce5f2cdf7849c4e4116488bbb0927bf80a7f1b (diff)
download: zlib-6084c550c310caf265156ea0c33bf6febf58e313.tar.gz
zlib-6084c550c310caf265156ea0c33bf6febf58e313.tar.bz2
zlib-6084c550c310caf265156ea0c33bf6febf58e313.zip
1 files changed, 41 insertions, 32 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index de7c578..c749e20 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -18,22 +18,29 @@ configure_file(
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
    ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt)
+# CMAKE_GENERATOR_PLATFORM doesn't work in the if
+set(GENERATOR ${CMAKE_GENERATOR_PLATFORM})
+if(GENERATOR)
+    set(PLATFORM "-A ${GENERATOR}")
+endif(GENERATOR)
 #
 # findpackage_test
 #
 add_test(NAME zlib_test_configure_find_package
-   COMMAND ${CMAKE_COMMAND}
+    COMMAND ${CMAKE_COMMAND}
-       -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build
+        ${PLATFORM}
-       -DCMAKE_BUILD_TYPE=$<CONFIG>
+        -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build
-       -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
+        -DCMAKE_BUILD_TYPE=$<CONFIG>
-       -DZDIR=${CMAKE_CURRENT_BINARY_DIR}/test_install/${CMAKE_INSTALL_LIBDIR}
+        -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
-       --fresh
+        -DZDIR=${CMAKE_CURRENT_BINARY_DIR}/test_install/${CMAKE_INSTALL_LIBDIR}
-       -G "${CMAKE_GENERATOR}"
+        --fresh
-       -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
+        -G "${CMAKE_GENERATOR}"
+        -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
 add_test(NAME zlib_test_build_find_package
-    COMMAND ${CMAKE_COMMAND} --build
+    COMMAND ${CMAKE_COMMAND} --build .
-            ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build
+    --config $<CONFIG>
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build)
 add_test(NAME zlib_test_test_find_package
@@ -58,22 +65,23 @@ set_tests_properties(zlib_test_test_find_package PROPERTIES
 # add_subdirectory_test
 #
 add_test(NAME zlib_test_configure_add_subdirectory
-   COMMAND ${CMAKE_COMMAND}
+    COMMAND ${CMAKE_COMMAND}
-       -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_test_build
+    ${PLATFORM}
-       -DCMAKE_BUILD_TYPE=$<CONFIG>
+    -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build
-       -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
+    -DCMAKE_BUILD_TYPE=$<CONFIG>
-       --fresh
+    -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
-       -G "${CMAKE_GENERATOR}"
+    --fresh
-       -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
+    -G "${CMAKE_GENERATOR}"
+    -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
 add_test(NAME zlib_test_build_add_subdirectory
-    COMMAND ${CMAKE_COMMAND} --build
+    COMMAND ${CMAKE_COMMAND} --build .
-            ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_test_build
+    --config $<CONFIG>
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_test_build)
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build)
 add_test(NAME zlib_test_test_add_subdirectory
    COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_test_build)
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build)
 set_tests_properties(zlib_test_configure_add_subdirectory PROPERTIES
    FIXTURES_SETUP as_config)
@@ -89,22 +97,23 @@ set_tests_properties(zlib_test_test_add_subdirectory PROPERTIES
 # add_subdirectory_exclude_test
 #
 add_test(NAME zlib_test_configure_add_subdirectory_exclude
-   COMMAND ${CMAKE_COMMAND}
+    COMMAND ${CMAKE_COMMAND}
-       -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_exclude_test_build
+    ${PLATFORM}
-       -DCMAKE_BUILD_TYPE=$<CONFIG>
+    -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build
-       -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
+    -DCMAKE_BUILD_TYPE=$<CONFIG>
-       --fresh
+    -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
-       -G "${CMAKE_GENERATOR}"
+    --fresh
-       -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
+    -G "${CMAKE_GENERATOR}"
+    -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
 add_test(NAME zlib_test_build_add_subdirectory_exclude
-    COMMAND ${CMAKE_COMMAND} --build
+    COMMAND ${CMAKE_COMMAND} --build .
-            ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_exclude_test_build
+    --config $<CONFIG>
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_exclude_test_build)
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build)
 add_test(NAME zlib_test_test_add_subdirectory_exclude
    COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_exclude_test_build)
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build)
 set_tests_properties(zlib_test_configure_add_subdirectory_exclude PROPERTIES
    FIXTURES_SETUP asx_config)
author	Vollstrecker <werner@vollstreckernet.de>	2024-12-05 11:10:23 +0100
committer	Mark Adler <madler@alumni.caltech.edu>	2025-01-31 19:59:10 -0800
commit	6084c550c310caf265156ea0c33bf6febf58e313 (patch)
tree	545b47a3868ac670f0d274c7e436076e8a89f232
parent	1fce5f2cdf7849c4e4116488bbb0927bf80a7f1b (diff)
download	zlib-6084c550c310caf265156ea0c33bf6febf58e313.tar.gz zlib-6084c550c310caf265156ea0c33bf6febf58e313.tar.bz2 zlib-6084c550c310caf265156ea0c33bf6febf58e313.zip

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index de7c578..c749e20 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt
@@ -18,22 +18,29 @@ configure_file(
18	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in	18	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
19	${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt)	19	${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt)
20		20
		21	# CMAKE_GENERATOR_PLATFORM doesn't work in the if
		22	set(GENERATOR ${CMAKE_GENERATOR_PLATFORM})
		23
		24	if(GENERATOR)
		25	set(PLATFORM "-A ${GENERATOR}")
		26	endif(GENERATOR)
21	#	27	#
22	# findpackage_test	28	# findpackage_test
23	#	29	#
24	add_test(NAME zlib_test_configure_find_package	30	add_test(NAME zlib_test_configure_find_package
25	COMMAND ${CMAKE_COMMAND}	31	COMMAND ${CMAKE_COMMAND}
26	-B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build	32	${PLATFORM}
27	-DCMAKE_BUILD_TYPE=$<CONFIG>	33	-B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build
28	-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install	34	-DCMAKE_BUILD_TYPE=$<CONFIG>
29	-DZDIR=${CMAKE_CURRENT_BINARY_DIR}/test_install/${CMAKE_INSTALL_LIBDIR}	35	-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
30	--fresh	36	-DZDIR=${CMAKE_CURRENT_BINARY_DIR}/test_install/${CMAKE_INSTALL_LIBDIR}
31	-G "${CMAKE_GENERATOR}"	37	--fresh
32	-S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)	38	-G "${CMAKE_GENERATOR}"
		39	-S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
33		40
34	add_test(NAME zlib_test_build_find_package	41	add_test(NAME zlib_test_build_find_package
35	COMMAND ${CMAKE_COMMAND} --build	42	COMMAND ${CMAKE_COMMAND} --build .
36	${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build	43	--config $<CONFIG>
37	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build)	44	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build)
38		45
39	add_test(NAME zlib_test_test_find_package	46	add_test(NAME zlib_test_test_find_package
@@ -58,22 +65,23 @@ set_tests_properties(zlib_test_test_find_package PROPERTIES
58	# add_subdirectory_test	65	# add_subdirectory_test
59	#	66	#
60	add_test(NAME zlib_test_configure_add_subdirectory	67	add_test(NAME zlib_test_configure_add_subdirectory
61	COMMAND ${CMAKE_COMMAND}	68	COMMAND ${CMAKE_COMMAND}
62	-B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_test_build	69	${PLATFORM}
63	-DCMAKE_BUILD_TYPE=$<CONFIG>	70	-B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build
64	-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install	71	-DCMAKE_BUILD_TYPE=$<CONFIG>
65	--fresh	72	-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
66	-G "${CMAKE_GENERATOR}"	73	--fresh
67	-S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)	74	-G "${CMAKE_GENERATOR}"
		75	-S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
68		76
69	add_test(NAME zlib_test_build_add_subdirectory	77	add_test(NAME zlib_test_build_add_subdirectory
70	COMMAND ${CMAKE_COMMAND} --build	78	COMMAND ${CMAKE_COMMAND} --build .
71	${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_test_build	79	--config $<CONFIG>
72	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_test_build)	80	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build)
73		81
74	add_test(NAME zlib_test_test_add_subdirectory	82	add_test(NAME zlib_test_test_add_subdirectory
75	COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>	83	COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>
76	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_test_build)	84	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build)
77		85
78	set_tests_properties(zlib_test_configure_add_subdirectory PROPERTIES	86	set_tests_properties(zlib_test_configure_add_subdirectory PROPERTIES
79	FIXTURES_SETUP as_config)	87	FIXTURES_SETUP as_config)
@@ -89,22 +97,23 @@ set_tests_properties(zlib_test_test_add_subdirectory PROPERTIES
89	# add_subdirectory_exclude_test	97	# add_subdirectory_exclude_test
90	#	98	#
91	add_test(NAME zlib_test_configure_add_subdirectory_exclude	99	add_test(NAME zlib_test_configure_add_subdirectory_exclude
92	COMMAND ${CMAKE_COMMAND}	100	COMMAND ${CMAKE_COMMAND}
93	-B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_exclude_test_build	101	${PLATFORM}
94	-DCMAKE_BUILD_TYPE=$<CONFIG>	102	-B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build
95	-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install	103	-DCMAKE_BUILD_TYPE=$<CONFIG>
96	--fresh	104	-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
97	-G "${CMAKE_GENERATOR}"	105	--fresh
98	-S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)	106	-G "${CMAKE_GENERATOR}"
		107	-S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
99		108
100	add_test(NAME zlib_test_build_add_subdirectory_exclude	109	add_test(NAME zlib_test_build_add_subdirectory_exclude
101	COMMAND ${CMAKE_COMMAND} --build	110	COMMAND ${CMAKE_COMMAND} --build .
102	${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_exclude_test_build	111	--config $<CONFIG>
103	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_exclude_test_build)	112	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build)
104		113
105	add_test(NAME zlib_test_test_add_subdirectory_exclude	114	add_test(NAME zlib_test_test_add_subdirectory_exclude
106	COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>	115	COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>
107	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectoy_exclude_test_build)	116	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build)
108		117
109	set_tests_properties(zlib_test_configure_add_subdirectory_exclude PROPERTIES	118	set_tests_properties(zlib_test_configure_add_subdirectory_exclude PROPERTIES
110	FIXTURES_SETUP asx_config)	119	FIXTURES_SETUP asx_config)