diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-12-10 05:06:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-10 05:06:53 (GMT) |
| commit | 5580d7ec815e506370c4b1d68fc5ed089442e15d (patch) | |
| tree | 5416be32e3251eeb809c1f16781d3e22644536f2 /test/ShellTests.cmake | |
| parent | 364d8cc3e749bcee4486897b6703f9ac7a303225 (diff) | |
| download | hdf5-5580d7ec815e506370c4b1d68fc5ed089442e15d.zip hdf5-5580d7ec815e506370c4b1d68fc5ed089442e15d.tar.gz hdf5-5580d7ec815e506370c4b1d68fc5ed089442e15d.tar.bz2 | |
Fix directory variable in shell scripts (#1273)
* Fix testswmr scripts with utils/test variable
* Change format of configure var assignment
* quote the variable value in configure
* Use sh.in expected var pattern
* Only ref builddir in script
* Create vars for utils/test and test as H5_<path>_BUILDDIR
* Use abs_top_builddir in test scripts
* Change script var to make it easier to read.
* Use @abs_top_builddir@ directly in paths
* Correct typos/comment
Diffstat (limited to 'test/ShellTests.cmake')
| -rw-r--r-- | test/ShellTests.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/ShellTests.cmake b/test/ShellTests.cmake index a6fda87..e7de735 100644 --- a/test/ShellTests.cmake +++ b/test/ShellTests.cmake @@ -22,8 +22,8 @@ if (PWSH) file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/vds_swmr_test") set (srcdir ${HDF5_TEST_SOURCE_DIR}) - set (bindir ${CMAKE_TEST_OUTPUT_DIRECTORY}) - set (testdir ${HDF5_TEST_BINARY_DIR}/H5TEST) + set (H5_UTILS_TEST_BUILDDIR ${CMAKE_TEST_OUTPUT_DIRECTORY}) + set (H5_TEST_BUILDDIR ${HDF5_TEST_BINARY_DIR}/H5TEST) configure_file(${HDF5_TEST_SOURCE_DIR}/testswmr.pwsh.in ${HDF5_TEST_BINARY_DIR}/H5TEST/testswmr.ps1 @ONLY) # test commented out as currently the programs are not allowing another access to the data file #add_test (H5SHELL-testswmr ${PWSH} ${HDF5_TEST_BINARY_DIR}/H5TEST/testswmr.ps1) @@ -42,8 +42,8 @@ elseif (UNIX) find_program (SH_PROGRAM bash) if (SH_PROGRAM) set (srcdir ${HDF5_TEST_SOURCE_DIR}) - set (bindir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) - set (testdir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + set (H5_UTILS_TEST_BUILDDIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + set (H5_TEST_BUILDDIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) ############################################################################## # configure scripts to test dir ############################################################################## |