Merged utility-based tests fix into cmake-based builds.

This commit is contained in:
Ward Fisher 2016-08-31 15:48:10 -06:00
parent b2e4b74e3a
commit 486f69522c
3 changed files with 23 additions and 14 deletions

View File

@ -68,16 +68,19 @@ ENDFOREACH()
ADD_TEST(nc_test ${EXECUTABLE_OUTPUT_PATH}/nc_test)
IF(BUILD_DISKLESS)
add_sh_test(nc_test run_diskless)
IF(BUILD_MMAP)
add_sh_test(nc_test run_mmap)
ENDIF()
IF(LARGE_FILE_TESTS)
add_sh_test(nc_test run_diskless2)
ENDIF()
IF(BUILD_UTILITIES)
ENDIF()
IF(BUILD_DISKLESS)
add_sh_test(nc_test run_diskless)
IF(BUILD_MMAP)
add_sh_test(nc_test run_mmap)
ENDIF(BUILD_MMAP)
IF(LARGE_FILE_TESTS)
add_sh_test(nc_test run_diskless2)
ENDIF(LARGE_FILE_TESTS)
ENDIF(BUILD_DISKLESS)
ENDIF(BUILD_UTILITIES)
# Copy some test files from current source dir to out-of-tree build dir.
FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.nc ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)

View File

@ -13,8 +13,12 @@ SET(NC4_TESTS tst_dims tst_dims2 tst_dims3 tst_files tst_files4 tst_vars
tst_rehash)
# Note, renamegroup needs to be compiled before run_grp_rename
build_bin_test(renamegroup)
add_sh_test(nc_test4 run_grp_rename)
IF(BUILD_UTILITIES)
build_bin_test(renamegroup)
add_sh_test(nc_test4 run_grp_rename)
ADD_SH_TEST(nc_test4 tst_misc)
ENDIF(BUILD_UTILITIES)
##
# The shell script, run_empty_vlen_test.sh,
@ -23,7 +27,7 @@ add_sh_test(nc_test4 run_grp_rename)
BUILD_BIN_TEST(tst_empty_vlen_unlim)
ADD_SH_TEST(nc_test4 run_empty_vlen_test)
ADD_SH_TEST(nc_test4 tst_misc)
IF(NOT MSVC)
SET(NC4_TESTS ${NC4_TESTS} tst_interops5 tst_camrun)

View File

@ -43,8 +43,10 @@ IF(ENABLE_TESTS)
ENDIF()
IF(ENABLE_DAP_REMOTE_TESTS)
add_sh_test(ncdap tst_remote3)
add_sh_test(ncdap tst_formatx)
IF(BUILD_UTILITIES)
add_sh_test(ncdap tst_remote3)
add_sh_test(ncdap tst_formatx)
ENDIF(BUILD_UTILTIES)
add_bin_test(ncdap test_partvar)
IF(ENABLE_DAP_LONG_TESTS)
add_sh_test(ncdap tst_longremote3)