Skip to content

Use one gmtest script to run all different kinds of tests #4172

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 5, 2020
Merged

Use one gmtest script to run all different kinds of tests #4172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f102a3
Use one gmtest to run all different kinds of tests
seisman Sep 5, 2020
f4acf6f
Temporarily enable tests
seisman Sep 5, 2020
94b7286
Revert "Temporarily enable tests"
seisman Sep 5, 2020
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
10 changes: 4 additions & 6 deletions doc/examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,14 @@ if (UNIX AND DO_ANIMATIONS)
endif (UNIX AND DO_ANIMATIONS)

# run examples (test)
file (GLOB _examples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/ex*/*.sh")
file (GLOB _examples RELATIVE ${CMAKE_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/ex*/*.sh")
# Remove a few known failed examples from tests
list (REMOVE_ITEM _examples "ex51/ex51.sh")
file (GLOB _anims RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/anim0[1-5]/*.sh")
list (REMOVE_ITEM _examples "doc/examples/ex51/ex51.sh")
file (GLOB _anims RELATIVE ${CMAKE_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/anim0[1-5]/*.sh")
if (DO_EXAMPLES AND BASH)
# this file takes care of setting up the test environment
configure_file (gmtest.in gmtest @ONLY)
foreach (_job ${_examples} ${_anims})
add_test (NAME ${_job}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${BASH} gmtest ${_job})
COMMAND ${BASH} ${CMAKE_BINARY_DIR}/test/gmtest ${_job})
endforeach (_job ${_examples} ${_anims})
endif (DO_EXAMPLES AND BASH)
219 changes: 0 additions & 219 deletions doc/examples/gmtest.in
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions doc/scripts/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,16 @@ add_custom_target (_docs_html_scripts_fig DEPENDS ${_scripts_png} ${_scripts_pdf
add_depend_to_target (docs_depends _docs_html_scripts_fig _docs_scripts_verbatim)

# run tests
file (GLOB _scripts_tests RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.sh")
file (GLOB _scripts_tests RELATIVE ${CMAKE_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.sh")
# GMT_-U.sh always fails
list (REMOVE_ITEM _scripts_tests GMT_-U.sh GMT_encoding.sh gen_data_App_O.sh gen_data_dummy.sh)
foreach (skip_test GMT_-U.sh GMT_encoding.sh gen_data_App_O.sh gen_data_dummy.sh)
list (REMOVE_ITEM _scripts_tests doc/scripts/${skip_test})
endforeach()

if (DO_TESTS AND BASH)
# this file takes care of setting up the test environment
configure_file (gmtest.in gmtest @ONLY)
foreach (_job ${_scripts_tests})
add_test (NAME ${_job}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${BASH} gmtest ${_job})
COMMAND ${BASH} ${CMAKE_BINARY_DIR}/test/gmtest ${_job})
endforeach (_job)
endif (DO_TESTS AND BASH)
Loading