diff --git a/ncdap_test/CMakeLists.txt b/ncdap_test/CMakeLists.txt index 4b7fce4bb..b15196197 100644 --- a/ncdap_test/CMakeLists.txt +++ b/ncdap_test/CMakeLists.txt @@ -5,22 +5,22 @@ add_definitions(-D"TOPSRCDIR=${CMAKE_SOURCE_DIR}") FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.sh) -FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE) +FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE) IF(ENABLE_DAP_REMOTE_TESTS) ADD_EXECUTABLE(nctestserver nctestserver.c) TARGET_LINK_LIBRARIES(nctestserver netcdf ${ALL_TLL_LIBS}) - #### - # We have to do a little tweaking + #### + # We have to do a little tweaking # to remove the Release/ and Debug/ directories # in MSVC builds. This is required to get # test scripts to work. #### IF(MSVC) - SET_TARGET_PROPERTIES(nctestserver PROPERTIES RUNTIME_OUTPUT_DIRECTORY + SET_TARGET_PROPERTIES(nctestserver PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - SET_TARGET_PROPERTIES(nctestserver PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG + SET_TARGET_PROPERTIES(nctestserver PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}) SET_TARGET_PROPERTIES(nctestserver PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}) @@ -33,7 +33,7 @@ IF(ENABLE_TESTS) # must be run in a particular order. It is painful but will use macros to help # keep it from being too bad. # Binary Test Macro - + add_sh_test(ncdap tst_ncdap3) IF(NOT MSVC) @@ -50,22 +50,22 @@ IF(ENABLE_TESTS) add_sh_test(ncdap tst_longremote3) ENDIF() add_sh_test(ncdap testurl) - + add_bin_test(ncdap test_nstride_cached) add_bin_test(ncdap t_misc) - + IF(ENABLE_DAP_AUTH_TESTS) add_bin_test(ncdap t_auth) add_sh_test(ncdap testauth) ENDIF() - + add_bin_test(ncdap test_varm3) - + ### # This test relates to NCF-330 in # the Unidata JIRA system. ### - add_bin_test(ncdap t_ncf330) + #add_bin_test(ncdap t_ncf330) ENDIF() ENDIF() diff --git a/ncdap_test/Makefile.am b/ncdap_test/Makefile.am index 87b0aec11..b4e0a9f95 100644 --- a/ncdap_test/Makefile.am +++ b/ncdap_test/Makefile.am @@ -45,10 +45,10 @@ test_nstride_cached_SOURCE = test_nstride_cached.c #t_auth1_SOURCES = t_auth1.c t_misc_SOURCES = t_misc.c test_varm3_SOURCES = test_varm3.c -t_ncf330_SOURCES = t_ncf330.c +#t_ncf330_SOURCES = t_ncf330.c TESTS += test_varm3 -TESTS += t_ncf330 +#TESTS += t_ncf330 TESTS += test_nstride_cached TESTS += t_misc