From 576fade85d8a1511b055e9ffb1646de3370aa6ef Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 6 Sep 2019 13:07:25 -0600 Subject: [PATCH] Fixing cmake-based large file tests in support of https://github.com/Unidata/netcdf-fortran/issues/198 --- CMakeLists.txt | 1 + nf03_test4/CMakeLists.txt | 4 ++-- nf03_test4/Makefile.am | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e4ee1e94..a49a3f8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -395,6 +395,7 @@ MACRO(build_bin_test F ext) ENDMACRO() OPTION(ENABLE_LARGE_FILE_TESTS "Run large file tests, which are slow and take lots of disk." OFF) +SET(LARGE_FILE_TESTS ${ENABLE_LARGE_FILE_TESTS}) OPTION(BUILD_BENCHMARKS "Run F90 I/O Benchmarks" OFF) OPTION(TEST_WITH_VALGRIND "Run extra tests with valgrind" OFF) OPTION(ENABLE_PARALLEL_TESTS "Run parallel I/O tests for F90 and F77" OFF) diff --git a/nf03_test4/CMakeLists.txt b/nf03_test4/CMakeLists.txt index 4281151a..de799a64 100644 --- a/nf03_test4/CMakeLists.txt +++ b/nf03_test4/CMakeLists.txt @@ -49,10 +49,10 @@ if (USE_NETCDF4) # This is the netCDF-4 F90 large file test. IF (LARGE_FILE_TESTS) - SET(nc4_largefile_PROGRAMS tst_flarge) + SET(nc4_largefile_PROGRAMS f90tst_flarge) SET(check_PROGRAMS ${check_PROGRAMS} ${nc4_largefile_PROGRAMS}) SET(TESTS ${TESTS} ${nc4_largefile_PROGRAMS}) - SET(tst_flarge_SOURCES tst_flarge.f90) + SET(f90tst_flarge_SOURCES f90tst_flarge.f90) ENDIF(LARGE_FILE_TESTS) # This is an f90 benchmark. diff --git a/nf03_test4/Makefile.am b/nf03_test4/Makefile.am index f113c7fc..706cf76d 100644 --- a/nf03_test4/Makefile.am +++ b/nf03_test4/Makefile.am @@ -34,11 +34,11 @@ f90tst_types_SOURCES = f90tst_types.f90 f90tst_types2_SOURCES = f90tst_types2.f90 # This is the netCDF-4 F90 large file test. -if ENABLE_LARGE_FILE_TESTS +if LARGE_FILE_TESTS check_PROGRAMS += f90tst_flarge TESTS += f90tst_flarge f90tst_flarge_SOURCES = f90tst_flarge.f90 -endif # ENABLE_LARGE_FILE_TESTS +endif # LARGE_FILE_TESTS # This is an f90 benchmark. if BUILD_BENCHMARKS