Merge all of my changes from merge-back-to-feature-vfd_swmr-attempt-1,

including the merge of `hdffv/hdf5/develop`, back to the branch that Vailin and
I share.

Now I need to put this branch on a fork with a less confusing name than
vchoi_fork!
This commit is contained in:
David Young
2019-12-09 10:30:58 -06:00
parent adcf8a315e
commit c8f533cfc3
1185 changed files with 170186 additions and 90335 deletions

View File

@@ -18,7 +18,7 @@ if (NOT TEST_PROGRAM)
message (FATAL_ERROR "Require TEST_PROGRAM to be defined")
endif ()
if (NOT TEST_FOLDER)
message ( FATAL_ERROR "Require TEST_FOLDER to be defined")
message (FATAL_ERROR "Require TEST_FOLDER to be defined")
endif ()
if (NOT TEST_OUTPUT)
message (FATAL_ERROR "Require TEST_OUTPUT to be defined")
@@ -30,18 +30,18 @@ if (NOT PERL_EXECUTABLE)
message (STATUS "Require PERL_EXECUTABLE to be defined")
endif ()
if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT})
if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
endif ()
if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
endif ()
message (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
if (TEST_LIBRARY_DIRECTORY)
if (WIN32 AND NOT MINGW)
if (WIN32 OR MINGW)
set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}")
else ()
set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
@@ -53,7 +53,7 @@ if (TEST_ENV_VAR)
#message (STATUS "ENV:${TEST_ENV_VAR}=$ENV{${TEST_ENV_VAR}}")
endif ()
message(STATUS "Background: ${PERL_EXECUTABLE} ${PERL_SCRIPT} ${TEST_PROGRAM}")
message (STATUS "Background: ${PERL_EXECUTABLE} ${PERL_SCRIPT} ${TEST_PROGRAM}")
execute_process (
COMMAND ${PERL_EXECUTABLE} ${PERL_SCRIPT} ${TEST_PROGRAM}
RESULT_VARIABLE SCRIPT_RESULT
@@ -61,36 +61,36 @@ execute_process (
OUTPUT_VARIABLE SCRIPT_OUTPUT
WORKING_DIRECTORY ${TEST_FOLDER}
)
message(STATUS "Background: ${SCRIPT_OUTPUT}")
if (NOT "${SCRIPT_RESULT}" STREQUAL "0")
message (STATUS "Background: ${SCRIPT_OUTPUT}")
if (SCRIPT_RESULT)
message (FATAL_ERROR "Failed: The background script failed ${SCRIPT_RESULT}: ${SCRIPT_ERR}")
endif ()
set(verification_done "0")
while(verification_done LESS "1")
message(STATUS "checking first stage:${TEST_FOLDER}/${TEST_ARGS1}")
if(EXISTS ${TEST_FOLDER}/${TEST_ERR})
set (verification_done "0")
while (verification_done LESS "1")
message (STATUS "checking first stage:${TEST_FOLDER}/${TEST_ARGS1}")
if (EXISTS "${TEST_FOLDER}/${TEST_ERR}")
# Error exit script
set(verification_done "3")
elseif(EXISTS ${TEST_FOLDER}/${TEST_ARGS1})
set (verification_done "3")
elseif (EXISTS "${TEST_FOLDER}/${TEST_ARGS1}")
file (STRINGS ${TEST_FOLDER}/${TEST_ARGS1} v1)
list (LENGTH v1 len_v1)
message(STATUS "v1:${v1} len_v1:${len_v1}")
if (NOT "${len_v1}" STREQUAL "0")
message (STATUS "v1:${v1} len_v1:${len_v1}")
if (len_v1)
list (GET v1 0 param1)
list (GET v1 -1 param2)
endif ()
file(REMOVE ${TEST_FOLDER}/${TEST_ARGS1})
message(STATUS "PARAM1:${param1} PARAM2:${param2}")
file (REMOVE ${TEST_FOLDER}/${TEST_ARGS1})
message (STATUS "PARAM1:${param1} PARAM2:${param2}")
if(${param1} MATCHES "VERIFICATION_DONE")
set(verification_done "1")
file(WRITE ${TEST_FOLDER}/${TEST_ARGS2} "all flush verification complete")
message(STATUS "write: ${TEST_FOLDER}/${TEST_ARGS2}")
else()
message(STATUS "execute: ${TEST_PROGRAM} ${param1} ${param2}")
if (param1 MATCHES "VERIFICATION_DONE")
set (verification_done "1")
file (WRITE ${TEST_FOLDER}/${TEST_ARGS2} "all flush verification complete")
message (STATUS "write: ${TEST_FOLDER}/${TEST_ARGS2}")
else ()
message (STATUS "execute: ${TEST_PROGRAM} ${param1} ${param2}")
execute_process (
COMMAND ${TEST_PROGRAM} ${param1} ${param2}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${TEST_PROGRAM} ${param1} ${param2}
RESULT_VARIABLE TEST_RESULT
OUTPUT_FILE ${TEST_OUTPUT}
ERROR_FILE ${TEST_OUTPUT}.err
@@ -98,42 +98,42 @@ while(verification_done LESS "1")
ERROR_VARIABLE TEST_ERROR
WORKING_DIRECTORY ${TEST_FOLDER}
)
message(STATUS "flush verification: ${TEST_OUT}")
if (NOT "${TEST_RESULT}" STREQUAL "0")
message (STATUS "flush verification: ${TEST_OUT}")
if (TEST_RESULT)
message (FATAL_ERROR "Failed: The flush verification failed ${TEST_RESULT}: ${TEST_ERROR}")
endif ()
file(WRITE ${TEST_FOLDER}/${TEST_ARGS2} "verification flush process done")
endif()
else()
message(STATUS "waiting: ${TEST_FOLDER}/${TEST_ARGS1}")
file (WRITE ${TEST_FOLDER}/${TEST_ARGS2} "verification flush process done")
endif ()
else ()
message (STATUS "waiting: ${TEST_FOLDER}/${TEST_ARGS1}")
#execute_process (COMMAND ${CMAKE_COMMAND} -E sleep 2)
endif()
endwhile()
endif ()
endwhile ()
while(verification_done LESS "2")
message(STATUS "checking second stage:${TEST_FOLDER}/${TEST_ARGS1}")
if(EXISTS ${TEST_FOLDER}/${TEST_ERR})
while (verification_done LESS "2")
message (STATUS "checking second stage:${TEST_FOLDER}/${TEST_ARGS1}")
if (EXISTS "${TEST_FOLDER}/${TEST_ERR}")
# Error exit script
set(verification_done "3")
elseif(EXISTS ${TEST_FOLDER}/${TEST_ARGS1})
set (verification_done "3")
elseif (EXISTS "${TEST_FOLDER}/${TEST_ARGS1}")
file (STRINGS ${TEST_FOLDER}/${TEST_ARGS1} v1)
list (LENGTH v1 len_v1)
message(STATUS "v1:${v1} len_v1:${len_v1}")
if (NOT "${len_v1}" STREQUAL "0")
message (STATUS "v1:${v1} len_v1:${len_v1}")
if (len_v1)
list (GET v1 0 param1)
list (GET v1 -1 param2)
endif ()
file(REMOVE ${TEST_FOLDER}/${TEST_ARGS1})
message(STATUS "PARAM1:${param1} PARAM2:${param2}")
file (REMOVE ${TEST_FOLDER}/${TEST_ARGS1})
message (STATUS "PARAM1:${param1} PARAM2:${param2}")
if(${param1} MATCHES "VERIFICATION_DONE")
set(verification_done "2")
file(WRITE ${TEST_FOLDER}/${TEST_ARGS2} "all refresh verification complete")
message(STATUS "write: ${TEST_FOLDER}/${TEST_ARGS2}")
else()
message(STATUS "execute: ${TEST_PROGRAM} ${param1}")
if (param1 MATCHES "VERIFICATION_DONE")
set (verification_done "2")
file (WRITE ${TEST_FOLDER}/${TEST_ARGS2} "all refresh verification complete")
message (STATUS "write: ${TEST_FOLDER}/${TEST_ARGS2}")
else ()
message (STATUS "execute: ${TEST_PROGRAM} ${param1}")
execute_process (
COMMAND ${TEST_PROGRAM} ${param1}
COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} ${TEST_PROGRAM} ${param1}
RESULT_VARIABLE TEST_RESULT
OUTPUT_FILE ${TEST_OUTPUT}
ERROR_FILE ${TEST_OUTPUT}.err
@@ -141,24 +141,24 @@ while(verification_done LESS "2")
ERROR_VARIABLE TEST_ERROR
WORKING_DIRECTORY ${TEST_FOLDER}
)
message(STATUS "refresh verification: ${TEST_OUT}")
if (NOT "${TEST_RESULT}" STREQUAL "0")
message (STATUS "refresh verification: ${TEST_OUT}")
if (TEST_RESULT)
message (FATAL_ERROR "Failed: The refresh verification failed ${TEST_RESULT}: ${TEST_ERROR}")
endif ()
file(WRITE ${TEST_FOLDER}/${TEST_ARGS2} "refresh verifiction process done")
endif()
else()
message(STATUS "waiting: ${TEST_FOLDER}/${TEST_ARGS1}")
file (WRITE ${TEST_FOLDER}/${TEST_ARGS2} "refresh verifiction process done")
endif ()
else ()
message (STATUS "waiting: ${TEST_FOLDER}/${TEST_ARGS1}")
#execute_process (COMMAND ${CMAKE_COMMAND} -E sleep 2)
endif()
endwhile()
endif ()
endwhile ()
message (STATUS "COMMAND Result: ${TEST_RESULT}")
# if the return value is !=${TEST_EXPECT} bail out
if (NOT "${TEST_RESULT}" STREQUAL "${TEST_EXPECT}")
if (NOT TEST_RESULT EQUAL TEST_EXPECT)
if (NOT TEST_NOERRDISPLAY)
if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT})
if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
message (STATUS "Output :\n${TEST_STREAM}")
endif ()
@@ -169,4 +169,4 @@ endif ()
message (STATUS "COMMAND Error: ${TEST_ERROR}")
# everything went fine...
message ("Passed")
message (STATUS "Passed")