Fixing cmake-based large file tests in support of #198

Unidata · Sep 6, 2019 · 576fade · 576fade
1 parent 19253ec
commit 576fade
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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