Merge pull request #76

Add `TEST_PROPERTIES` keyword in `ecbuild_add_test`
ecmwf · Jan 15, 2025 · b2ee331 · b2ee331
2 parents 23c94e7 + 3b5db9c
commit b2ee331
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 1 deletion.
diff --git a/cmake/ecbuild_add_test.cmake b/cmake/ecbuild_add_test.cmake
@@ -134,6 +134,9 @@
 # PROPERTIES : optional
 #   custom properties to set on the target
 #
+# TEST_PROPERTIES : optional
+#   custom properties to set on the test
+#
 # ENVIRONMENT : optional
 #   list of environment variables to set in the test environment
 #
@@ -185,7 +188,7 @@ function( ecbuild_add_test )
   set( single_value_args TARGET ENABLED COMMAND TYPE LINKER_LANGUAGE MPI OMP WORKING_DIRECTORY )
   set( multi_value_args  SOURCES OBJECTS LIBS INCLUDES TEST_DEPENDS DEPENDS LABELS ARGS
                          PERSISTENT DEFINITIONS RESOURCES TEST_DATA CFLAGS
-                         CXXFLAGS FFLAGS GENERATED CONDITION PROPERTIES ENVIRONMENT )
+                         CXXFLAGS FFLAGS GENERATED CONDITION TEST_PROPERTIES PROPERTIES ENVIRONMENT )
 
   cmake_parse_arguments( _PAR "${options}" "${single_value_args}" "${multi_value_args}"  ${_FIRST_ARG} ${ARGN} )
 
@@ -467,6 +470,10 @@ function( ecbuild_add_test )
         set_target_properties( ${_PAR_TARGET} PROPERTIES ${_PAR_PROPERTIES} )
       endif()
 
+      if( DEFINED _PAR_TEST_PROPERTIES )
+        set_tests_properties( ${_PAR_TARGET} PROPERTIES ${_PAR_TEST_PROPERTIES} )
+      endif()
+
       # get test data
 
       if( _PAR_TEST_DATA )

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -12,3 +12,4 @@ add_subdirectory( interface_library )
 add_subdirectory( project_import )
 add_subdirectory( project_summary )
 add_subdirectory( ecbuild_override_compiler_flags )
+add_subdirectory( test_properties )
diff --git a/tests/test_properties/CMakeLists.txt b/tests/test_properties/CMakeLists.txt
@@ -0,0 +1,7 @@
+
+ecbuild_add_test(
+  TARGET     test_ecbuild_test_properties
+  TYPE       SCRIPT
+  COMMAND    ${CMAKE_CURRENT_SOURCE_DIR}/build-and-run.sh
+  ENVIRONMENT CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} CMAKE_CURRENT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}
+)
diff --git a/tests/test_properties/build-and-run.sh b/tests/test_properties/build-and-run.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -e
+
+HERE=${CMAKE_CURRENT_BINARY_DIR:-"$( cd $( dirname "${BASH_SOURCE[0]}" ) && pwd -P )"}
+SOURCE=${CMAKE_CURRENT_SOURCE_DIR:-$HERE}
+
+# Add ecbuild to path
+export PATH=$SOURCE/../../bin:$PATH
+echo $PATH
+echo $SOURCE
+
+# Build the project
+ecbuild $SOURCE/test_project -B $HERE/build
+
+# Run only one specific test (which should invoke the others)
+(cd $HERE/build; ctest -R write_world_after_hello)  # Avoid using --test-dir option in ctest
+
+# Check if the output is as expected
+echo -n "Hello, World!" | diff - $HERE/build/output.txt
diff --git a/tests/test_properties/test_project/CMakeLists.txt b/tests/test_properties/test_project/CMakeLists.txt
@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.7 FATAL_ERROR)
+
+find_package( ecbuild REQUIRED )
+project( test_test_properties VERSION 0.1.0 LANGUAGES NONE )
+
+ecbuild_add_test(
+    TARGET clean_output
+    TEST_PROPERTIES FIXTURES_SETUP clean_output
+    COMMAND ${CMAKE_COMMAND}
+    ARGS -E remove ${CMAKE_CURRENT_BINARY_DIR}/output.txt
+)
+
+ecbuild_add_test(
+    TARGET write_hello
+    TEST_PROPERTIES FIXTURES_SETUP write_hello FIXTURES_REQUIRED clean_output
+    COMMAND bash
+    ARGS -c "echo -n 'Hello, ' >> ${CMAKE_CURRENT_BINARY_DIR}/output.txt"
+)
+
+ecbuild_add_test(
+    TARGET write_world_after_hello
+    TEST_PROPERTIES FIXTURES_REQUIRED write_hello
+    COMMAND bash
+    ARGS -c "echo -n 'World!' >> ${CMAKE_CURRENT_BINARY_DIR}/output.txt"
+)