Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert vds swmr test script to powershell #1245

Merged
merged 27 commits into from
Dec 8, 2021
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9ca362c
Convert SWMR shell scripts to Windows powershell.
byrnHDF Nov 18, 2021
17107b7
Use $LastExitCode instead of $? in script
byrnHDF Nov 18, 2021
5a48427
Prevent execution in a different window
byrnHDF Nov 18, 2021
87940e8
Github #969 Use stdout instead of file for configure check (#1089)
byrnHDF Nov 18, 2021
2d1f708
Don't allow H5Pset(get)_all_coll_metadata_ops for DXPLs (#1201)
jhendersonHDF Nov 18, 2021
2852cf8
Fixes const warnings in H5ES package (#1211)
derobins Nov 18, 2021
114df8f
Quiets a 'set but not used' warning in h5diff_array.c (#1210)
derobins Nov 18, 2021
4946dd3
Convert vds swmr test script to powershell
byrnHDF Nov 19, 2021
45cc737
Enable vdsswmr powershell test
byrnHDF Nov 19, 2021
15a1f96
Add configure vdsswmr statement
byrnHDF Nov 19, 2021
e0ffedc
Correct powershell script vars
byrnHDF Nov 19, 2021
4d9aaa8
Convert SWMR shell scripts to Windows powershell.
byrnHDF Nov 18, 2021
12d921a
Use $LastExitCode instead of $? in script
byrnHDF Nov 18, 2021
0f8c84d
Prevent execution in a different window
byrnHDF Nov 18, 2021
518c561
Github #969 Use stdout instead of file for configure check (#1089)
byrnHDF Nov 18, 2021
feed5c7
Convert vds swmr test script to powershell
byrnHDF Nov 19, 2021
59df326
Enable vdsswmr powershell test
byrnHDF Nov 19, 2021
9a04e83
Add configure vdsswmr statement
byrnHDF Nov 19, 2021
b86e1f2
Correct powershell script vars
byrnHDF Nov 19, 2021
5df81f9
Merge branch 'develop-pwsh'
byrnHDF Dec 1, 2021
2b7a0f7
Cleanup review issues
byrnHDF Dec 1, 2021
921ef71
Fix variable assignment
byrnHDF Dec 1, 2021
6211689
Change the wait function to pass in the path
byrnHDF Dec 1, 2021
49a0ac8
Disable actual test execution until programs fixed
byrnHDF Dec 2, 2021
ec9a152
Adjust copyright text
byrnHDF Dec 8, 2021
bec67b4
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Dec 8, 2021
df65f84
Fix spelling
byrnHDF Dec 8, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -1351,8 +1351,10 @@
./test/testlinks_env.sh.in
./test/testmeta.c
./test/test_mirror.sh.in
./test/testswmr.pwsh.in
./test/testswmr.sh.in
./test/testvds_env.sh.in
./test/testvdsswmr.pwsh.in
./test/testvdsswmr.sh.in
./test/tfile.c
./test/tgenprop.c
Expand Down
10 changes: 10 additions & 0 deletions release_docs/RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,16 @@ New Features

Configuration:
-------------
- CMake will now run the PowerShell script tests in test/ by default
on Windows.

The test directory includes several shell script tests that previously
were not run by CMake on Windows. These are now run by default.
If TEST_SHELL_SCRIPTS is ON and PWSH is found, the PowerShell scripts
will execute. Similar to the bash scripts on unix platforms.

(ADB - 2021/11/23)

- Added new configure option to support building parallel tools.
See Tools below (autotools - CMake):
--enable-parallel-tools HDF5_BUILD_PARALLEL_TOOLS
Expand Down
34 changes: 21 additions & 13 deletions test/ShellTests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,28 @@
### T E S T I N G S H E L L S C R I P T S ###
##############################################################################

if (UNIX)
find_program (PWSH NAMES pwsh powershell)
byrnHDF marked this conversation as resolved.
Show resolved Hide resolved
if (PWSH)
file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/usecases_test")
file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/swmr_test")
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)
configure_file(${HDF5_TEST_SOURCE_DIR}/testswmr.pwsh.in ${HDF5_TEST_BINARY_DIR}/H5TEST/testswmr.ps1 @ONLY)
add_test (H5SHELL-testswmr ${PWSH} ${HDF5_TEST_BINARY_DIR}/H5TEST/testswmr.ps1)
set_tests_properties (H5SHELL-testswmr PROPERTIES
ENVIRONMENT "PATH=$ENV{PATH}:${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
configure_file(${HDF5_TEST_SOURCE_DIR}/testvdsswmr.pwsh.in ${HDF5_TEST_BINARY_DIR}/H5TEST/testvdsswmr.ps1 @ONLY)
add_test (H5SHELL-testvdsswmr ${PWSH} ${HDF5_TEST_BINARY_DIR}/H5TEST/testvdsswmr.ps1)
set_tests_properties (H5SHELL-testvdsswmr PROPERTIES
ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
elseif (UNIX)
find_program (SH_PROGRAM bash)
if (SH_PROGRAM)
set (srcdir ${HDF5_TEST_SOURCE_DIR})
Expand All @@ -35,24 +55,13 @@ if (UNIX)
##############################################################################
# copy test programs to test dir
##############################################################################
#shell script creates dir
#file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/swmr_test")
add_custom_command (
TARGET accum_swmr_reader
POST_BUILD
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different "${HDF5_SOURCE_DIR}/bin/output_filter.sh" "${HDF5_TEST_BINARY_DIR}/H5TEST/bin/output_filter.sh"
)

#shell script creates dir
byrnHDF marked this conversation as resolved.
Show resolved Hide resolved
#file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/usecases_test")

#shell script creates dir
#file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/swmr_test")

#shell script creates dir
#file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/H5TEST/vds_swmr_test")

##############################################################################
##############################################################################
### A D D I T I O N A L T E S T S ###
Expand Down Expand Up @@ -108,6 +117,5 @@ if (UNIX)
ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)

endif ()
endif ()
Loading