Merge S3 code from develop to 1.10

This commit is contained in:
Allen Byrne
2019-09-13 12:18:36 -05:00
parent 5dbb76ebca
commit 3457362c92
66 changed files with 17984 additions and 695 deletions

View File

@@ -343,6 +343,15 @@ if (TEST_GREP_COMPARE)
endif ()
endif ()
# dump the output unless nodisplay option is set
if (TEST_SKIP_COMPARE AND NOT TEST_NO_DISPLAY)
file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
execute_process (
COMMAND ${CMAKE_COMMAND} -E echo ${TEST_STREAM}
RESULT_VARIABLE TEST_RESULT
)
endif ()
# everything went fine...
message (STATUS "${TEST_PROGRAM} Passed")