Move examples to inside ctest

Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>
spglib · Jan 19, 2024 · 2924ef6 · 2924ef6
1 parent f5f013c
commit 2924ef6
Show file tree

Hide file tree

Showing 24 changed files with 47 additions and 65 deletions.
diff --git a/.distro/plans/examples.fmf b/.distro/plans/examples.fmf
diff --git a/example/.fmf/version b/example/.fmf/version
diff --git a/example/c_api b/example/c_api
@@ -0,0 +1 @@
+../test/example/c_api/
diff --git a/example/c_api/main.fmf b/example/c_api/main.fmf
diff --git a/example/fortran_api b/example/fortran_api
@@ -0,0 +1 @@
+../test/example/fortran_api/
diff --git a/example/fortran_api/main.fmf b/example/fortran_api/main.fmf
diff --git a/example/main.fmf b/example/main.fmf
diff --git a/example/python_api b/example/python_api
@@ -0,0 +1 @@
+../test/example/python_api/
diff --git a/example/python_api/main.fmf b/example/python_api/main.fmf
diff --git a/example/test.sh b/example/test.sh
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -174,7 +174,9 @@ function(Spglib_add_test test)
 	```cmake
 	Spglib_add_test(<name>
 			[TEST_NAME <test_name>]
-			[LABELS <label1> <label2>])
+			[LABELS <label1> <label2>]
+			[TEST_COMMAND <arg1> <arg2>]
+			)
 	```
 
 	## Options
@@ -188,6 +190,9 @@ function(Spglib_add_test test)
 	`LABELS`
 	  Additional labels to be added
 
+	`TEST_COMMAND`
+	  Test command to use instead of ctest
+
 	]===]
 
 	list(APPEND CMAKE_MESSAGE_CONTEXT "Spglib_add_test")
@@ -198,6 +203,7 @@ function(Spglib_add_test test)
 	)
 	set(ARGS_MultiValue
 			LABELS
+			TEST_COMMAND
 	)
 	cmake_parse_arguments(PARSE_ARGV 1 ARGS "${ARGS_Options}" "${ARGS_OneValue}" "${ARGS_MultiValue}")
 	# Check required/optional arguments
@@ -207,6 +213,12 @@ function(Spglib_add_test test)
 	if (NOT DEFINED ARGS_TEST_NAME)
 		set(ARGS_TEST_NAME ${test})
 	endif ()
+	if (NOT DEFINED ARGS_TEST_COMMAND)
+		set(ARGS_TEST_COMMAND
+				${CMAKE_CTEST_COMMAND} --test-dir ${CMAKE_CURRENT_BINARY_DIR}/${test} --output-on-failure
+		)
+	endif ()
+
 	set(extra_args)
 	if (Spglib_IS_TOP_LEVEL)
 		list(APPEND extra_args
@@ -233,7 +245,7 @@ function(Spglib_add_test test)
 			--build-generator "${CMAKE_GENERATOR}"
 			--build-options
 			${compiler_args} ${extra_args}
-			--test-command ${CMAKE_CTEST_COMMAND} --test-dir ${CMAKE_CURRENT_BINARY_DIR}/${test} --output-on-failure
+			--test-command ${ARGS_TEST_COMMAND}
 	)
 	set_tests_properties(${ARGS_TEST_NAME} PROPERTIES
 			LABELS "${ARGS_LABELS}"

diff --git a/test/example/CMakeLists.txt b/test/example/CMakeLists.txt
@@ -0,0 +1,30 @@
+set_property(DIRECTORY APPEND
+		PROPERTY LABELS example
+)
+
+set(test_list
+		c_api
+)
+if (SPGLIB_WITH_Fortran)
+	list(APPEND test_list
+			fortran_api
+	)
+endif ()
+
+foreach (test IN LISTS test_list)
+	Spglib_add_test(${test}
+			TEST_NAME example-${test}
+			TEST_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${test}/example && ${CMAKE_CURRENT_BINARY_DIR}/${test}/example_full
+	)
+endforeach ()
+
+if (SPGLIB_WITH_Python)
+	add_test (NAME example-python
+			COMMAND ${Python_EXECUTABLE} -m pytest
+			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/python_api/example.py
+	)
+	add_test (NAME example-python-full
+			COMMAND ${Python_EXECUTABLE} -m pytest
+			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/python_api/example_full.py
+	)
+endif ()
diff --git a/example/c_api/CMakeLists.txt → test/example/c_api/CMakeLists.txt b/example/c_api/CMakeLists.txt → test/example/c_api/CMakeLists.txt
diff --git a/example/c_api/README.md → test/example/c_api/README.md b/example/c_api/README.md → test/example/c_api/README.md
diff --git a/example/c_api/example.c → test/example/c_api/example.c b/example/c_api/example.c → test/example/c_api/example.c
diff --git a/example/c_api/example_full.c → test/example/c_api/example_full.c b/example/c_api/example_full.c → test/example/c_api/example_full.c
diff --git a/example/c_api/frequency.dat → test/example/c_api/frequency.dat b/example/c_api/frequency.dat → test/example/c_api/frequency.dat
diff --git a/example/fortran_api/CMakeLists.txt → test/example/fortran_api/CMakeLists.txt b/example/fortran_api/CMakeLists.txt → test/example/fortran_api/CMakeLists.txt
diff --git a/example/fortran_api/README.md → test/example/fortran_api/README.md b/example/fortran_api/README.md → test/example/fortran_api/README.md
diff --git a/example/fortran_api/example.F90 → test/example/fortran_api/example.F90 b/example/fortran_api/example.F90 → test/example/fortran_api/example.F90
diff --git a/example/fortran_api/example_full.F90 → test/example/fortran_api/example_full.F90 b/example/fortran_api/example_full.F90 → test/example/fortran_api/example_full.F90
diff --git a/example/python_api/README.md → test/example/python_api/README.md b/example/python_api/README.md → test/example/python_api/README.md
diff --git a/example/python_api/example.py → test/example/python_api/example.py b/example/python_api/example.py → test/example/python_api/example.py
diff --git a/example/python_api/example_full.py → test/example/python_api/example_full.py b/example/python_api/example_full.py → test/example/python_api/example_full.py