Changing some cmake infrastructure re: how tests are built.

This commit is contained in:
Ward Fisher 2015-10-29 19:50:48 +00:00
parent b7a4f1c7b5
commit 4e60400275
2 changed files with 2 additions and 3 deletions

View File

@ -1140,7 +1140,7 @@ ENDMACRO()
# Binary tests which are used by a script looking for a specific name.
MACRO(add_bin_test_no_prefix F)
build_bin_test(${F})
ADD_TEST(${F} ${EXECUTABLE_OUTPUT_PATH}/${F})
#ADD_TEST(${F} ${EXECUTABLE_OUTPUT_PATH}/${F})
IF(MSVC)
SET_PROPERTY(TEST ${F} PROPERTY FOLDER "tests/")
SET_TARGET_PROPERTIES(${F} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
@ -1169,7 +1169,6 @@ ENDMACRO()
MACRO(add_bin_test prefix F)
ADD_EXECUTABLE(${prefix}_${F} ${F}.c)
TARGET_LINK_LIBRARIES(${prefix}_${F}
${ALL_TLL_LIBS}
netcdf

View File

@ -8,7 +8,7 @@ echo "Testing file created with pnetcdf is modifiable with netCDF..."
./tst_pnetcdf
echo "Testing file created with pnetcdf works when adding variables..."
./tst_addvar
./tst_addvar tst_pnetcdf.nc
set -x
# We assume a min of at least 2 processors is available