Skip to content

Commit 7e9e7d5

Browse files
committed
Add HDF5_PLUGIN_KEYSTORE to h5copy ERR test macro for signed plugins
The ADD_H5_UD_ERR_TEST macro was missing the test keystore, causing h5diff in the DIFF step to fail signature verification when loading the filter plugin.
1 parent 655f4fc commit 7e9e7d5

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

tools/test/h5copy/CMakeTests.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,8 @@ macro (ADD_H5_UD_ERR_TEST testname resultcode infile sparam srcname dparam dstna
539539
-D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
540540
-D "TEST_ENV_VALUE=${ud_search_path}${CMAKE_SEP}${vol_plugin_path}"
541541
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
542+
$<$<BOOL:${HDF5_REQUIRE_SIGNED_PLUGINS}>:-D>
543+
$<$<BOOL:${HDF5_REQUIRE_SIGNED_PLUGINS}>:TEST_KEYSTORE_DIR=${CMAKE_BINARY_DIR}/test_keystore>
542544
-P "${HDF_RESOURCES_DIR}/runTest.cmake"
543545
)
544546
set_tests_properties (${vol_prefix}H5COPY_UD_ERR-${testname} PROPERTIES
@@ -567,6 +569,8 @@ macro (ADD_H5_UD_ERR_TEST testname resultcode infile sparam srcname dparam dstna
567569
-D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
568570
-D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins${CMAKE_SEP}${vol_plugin_path}"
569571
-D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
572+
$<$<BOOL:${HDF5_REQUIRE_SIGNED_PLUGINS}>:-D>
573+
$<$<BOOL:${HDF5_REQUIRE_SIGNED_PLUGINS}>:TEST_KEYSTORE_DIR=${CMAKE_BINARY_DIR}/test_keystore>
570574
-P "${HDF_RESOURCES_DIR}/runTest.cmake"
571575
)
572576
set_tests_properties (${vol_prefix}H5COPY_UD_ERR-${testname}-DIFF PROPERTIES

0 commit comments

Comments
 (0)