1 10 merges from develop (#298)
* HDFFV-10865 - merge from dev, HDFArray perf fix. * Remove duplicate setting * Whitespace changes after clang format * Undo version 11 clang format changes * Merge CMake changes from develop * test testing script merge from develop * Update supported platforms
This commit is contained in:
@@ -16,18 +16,12 @@
|
||||
if (NOT TEST_PROGRAM)
|
||||
message (FATAL_ERROR "Require TEST_PROGRAM to be defined")
|
||||
endif ()
|
||||
#if (NOT TEST_ARGS)
|
||||
# message (STATUS "Require TEST_ARGS to be defined")
|
||||
#endif ()
|
||||
if (NOT TEST_FOLDER)
|
||||
message (FATAL_ERROR "Require TEST_FOLDER to be defined")
|
||||
endif ()
|
||||
if (NOT TEST_OUTPUT)
|
||||
message (FATAL_ERROR "Require TEST_OUTPUT to be defined")
|
||||
endif ()
|
||||
#if (NOT TEST_EXPECT)
|
||||
# message (STATUS "Require TEST_EXPECT to be defined")
|
||||
#endif ()
|
||||
if (NOT TEST_FILTER)
|
||||
message (STATUS "Optional TEST_FILTER to be defined")
|
||||
endif ()
|
||||
@@ -55,7 +49,9 @@ endif ()
|
||||
|
||||
if (TEST_ENV_VAR)
|
||||
set (ENV{${TEST_ENV_VAR}} "${TEST_ENV_VALUE}")
|
||||
#message (STATUS "ENV:${TEST_ENV_VAR}=$ENV{${TEST_ENV_VAR}}")
|
||||
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
|
||||
message (TRACE "ENV:${TEST_ENV_VAR}=$ENV{${TEST_ENV_VAR}}")
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
# run the test program, capture the stdout/stderr and the result var
|
||||
|
||||
Reference in New Issue
Block a user