attempting to get cmake build working with new nc_perf directory

This commit is contained in:
Ed Hartnett 2019-03-18 08:09:46 -06:00
parent 43034c7b97
commit 51b8ba10b4
3 changed files with 13 additions and 21 deletions

View File

@ -1766,6 +1766,7 @@ IF(ENABLE_TESTS)
IF(USE_NETCDF4)
INCLUDE_DIRECTORIES(h5_test)
ADD_SUBDIRECTORY(nc_test4)
ADD_SUBDIRECTORY(nc_perf)
ADD_SUBDIRECTORY(h5_test)
ENDIF()
IF(ENABLE_DAP2)

View File

@ -53,7 +53,7 @@ tst_wrf_reads tst_attsperf
# endif # TEST_PARALLEL4
# endif # BUILD_UTILITIES
EXTRA_DIST = run_par_bm_test.sh.in run_knmi_bm.sh
EXTRA_DIST = run_par_bm_test.sh.in run_knmi_bm.sh CMakeLists.txt
CLEANFILES = tst_*.nc

View File

@ -1,9 +1,13 @@
# 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
# 2015, 2016, 2017, 2018, 2019
# University Corporation for Atmospheric Research/Unidata.
# See netcdf-c/COPYRIGHT file for more info.
# This is the cmake build file for the nc_test4 directory.
# Ward Fisher, Ed Hartnett
# Some extra tests
SET(NC4_TESTS tst_dims tst_dims2 tst_dims3 tst_files tst_files4
tst_vars tst_varms tst_unlim_vars tst_converts tst_converts2
@ -63,19 +67,6 @@ IF(USE_SZIP)
ENDIF()
ENDIF()
IF(BUILD_BENCHMARKS)
add_sh_test(nc_test4 run_bm_test1)
add_sh_test(nc_test4 run_bm_elena)
add_sh_test(nc_test4 run_bm_test2)
add_sh_test(nc_test4 run_tst_chunks)
add_sh_test(nc_test4 run_knmi_bm)
SET(NC4_TESTS ${NC4_TESTS} tst_create_files bm_file tst_chunks3 tst_ar4 tst_ar4_3d tst_ar4_4d bm_many_objs tst_h_many_atts bm_many_atts tst_files2 tst_files3 tst_h_files3 tst_mem tst_knmi bm_netcdf4_recs)
IF(TEST_PARALLEL)
add_sh_test(nc_test4 run_par_bm_test)
ENDIF()
ENDIF()
# Copy some test files from current source dir to out-of-tree build dir.
FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.nc ${CMAKE_CURRENT_SOURCE_DIR}/ref_bzip2.c ${CMAKE_CURRENT_SOURCE_DIR}/*.sh ${CMAKE_CURRENT_SOURCE_DIR}/*.h5 ${CMAKE_CURRENT_SOURCE_DIR}/*.cdl)
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
@ -100,11 +91,11 @@ IF(TEST_PARALLEL4)
add_sh_test(nc_test4 run_par_test)
ENDIF()
IF(ENABLE_METADATA_PERF)
build_bin_test(bigmeta)
build_bin_test(openbigmeta)
build_bin_test(tst_attsperf)
add_sh_test(nc_test4 perftest)
ENDIF()
# IF(ENABLE_METADATA_PERF)
# build_bin_test(bigmeta)
# build_bin_test(openbigmeta)
# build_bin_test(tst_attsperf)
# add_sh_test(nc_test4 perftest)
# ENDIF()
ADD_EXTRA_DIST(findplugin.in run_par_test.sh.in)