From d135fb4200cffca70bb312effa880e0317b31983 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 7 Dec 2018 14:44:47 -0700 Subject: [PATCH] Removed confounding text from a reference file, turned on filter testing by default in Cmake-based builds. --- CMakeLists.txt | 4 ++-- nc_test4/ref_bzip2.c | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0374c5c6b..897d730e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1150,8 +1150,8 @@ IF (ENABLE_PARALLEL_TESTS AND NOT USE_PARALLEL) ENDIF() # Enable special filter test; experimental when using cmake. -OPTION(ENABLE_FILTER_TESTING "Enable filter testing. Ignored if shared libraries or netCDF4 are not enabled" OFF) -IF(NOT ENABLE_NETCDF4) +OPTION(ENABLE_FILTER_TESTING "Enable filter testing. Ignored if shared libraries or netCDF4 are not enabled" ON) +IF(ENABLE_FILTER_TESTING AND NOT ENABLE_NETCDF_4) MESSAGE(WARNING "ENABLE_FILTER_TESTING requires netCDF-4. Disabling.") SET(ENABLE_FILTER_TESTING OFF CACHE BOOL "") ENDIF() diff --git a/nc_test4/ref_bzip2.c b/nc_test4/ref_bzip2.c index 058d7314b..e93f3cac2 100644 --- a/nc_test4/ref_bzip2.c +++ b/nc_test4/ref_bzip2.c @@ -1,13 +1,3 @@ -/*! \file - -Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, -2015, 2016, 2017, 2018 -University Corporation for Atmospheric Research/Unidata. - -See \ref copyright file for more info. - -*/ #include #include #include