From 73354a98623cac6d14cece7b6c27049457de873e Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Sun, 17 Mar 2019 08:11:08 -0600 Subject: [PATCH] moved tst_create_files from nc_test4 to nc_perf --- nc_perf/Makefile.am | 39 ++++++++++++++ {nc_test4 => nc_perf}/tst_create_files.c | 0 nc_test4/Makefile.am | 66 ++++++++++++------------ 3 files changed, 72 insertions(+), 33 deletions(-) rename {nc_test4 => nc_perf}/tst_create_files.c (100%) diff --git a/nc_perf/Makefile.am b/nc_perf/Makefile.am index 09a2ecf54..11dbc2e37 100644 --- a/nc_perf/Makefile.am +++ b/nc_perf/Makefile.am @@ -19,3 +19,42 @@ TEST_EXTENSIONS = .sh # Link to our assembled library. AM_LDFLAGS += ${top_builddir}/liblib/libnetcdf.la LDADD = ${top_builddir}/liblib/libnetcdf.la + +# check_PROGRAMS += 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_mem tst_knmi bm_netcdf4_recs tst_wrf_reads \ +# tst_attsperf +check_PROGRAMS = tst_create_files + +# bm_netcdf4_recs_SOURCES = bm_netcdf4_recs.c tst_utils.c +# bm_many_atts_SOURCES = bm_many_atts.c tst_utils.c +# bm_many_objs_SOURCES = bm_many_objs.c tst_utils.c +# tst_ar4_3d_SOURCES = tst_ar4_3d.c tst_utils.c +# tst_ar4_4d_SOURCES = tst_ar4_4d.c tst_utils.c +# tst_files2_SOURCES = tst_files2.c tst_utils.c +# tst_ar4_SOURCES = tst_ar4.c tst_utils.c +# tst_h_many_atts_SOURCES = tst_h_many_atts.c tst_utils.c +# bm_file_SOURCES = bm_file.c tst_utils.c +# tst_knmi_SOURCES = tst_knmi.c tst_utils.c +# tst_wrf_reads_SOURCES = tst_wrf_reads.c tst_utils.c + +# TESTS += tst_ar4_3d tst_create_files run_bm_elena.sh \ +# run_tst_chunks.sh tst_files3 tst_mem run_knmi_bm.sh tst_wrf_reads \ +# tst_attsperf +TESTS = tst_create_files + +#run_bm_elena.log: tst_create_files.log tst_files.log + +# if BUILD_UTILITIES +# TESTS += run_bm_test1.sh run_bm_test2.sh + +# # tst_create_files creates files for other tests. +# run_bm_test1.log: tst_create_files.log +# run_bm_test2.log: tst_create_files.log + +# # This will run a parallel I/O benchmark for parallel builds. +# if TEST_PARALLEL4 +# TESTS += run_par_bm_test.sh +# run_par_bm_test.log: tst_create_files.log +# endif # TEST_PARALLEL4 +# endif # BUILD_UTILITIES diff --git a/nc_test4/tst_create_files.c b/nc_perf/tst_create_files.c similarity index 100% rename from nc_test4/tst_create_files.c rename to nc_perf/tst_create_files.c diff --git a/nc_test4/Makefile.am b/nc_test4/Makefile.am index f055dff36..29f4e9f08 100644 --- a/nc_test4/Makefile.am +++ b/nc_test4/Makefile.am @@ -60,45 +60,45 @@ check_PROGRAMS += tst_v2 TESTS += tst_v2 endif # BUILD_V2 -# If benchmarks were turned on, build and run a bunch more tests. -if BUILD_BENCHMARKS -check_PROGRAMS += 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_mem tst_knmi bm_netcdf4_recs tst_wrf_reads \ -tst_attsperf +# # If benchmarks were turned on, build and run a bunch more tests. +# if BUILD_BENCHMARKS +# check_PROGRAMS += 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_mem tst_knmi bm_netcdf4_recs tst_wrf_reads \ +# tst_attsperf -bm_netcdf4_recs_SOURCES = bm_netcdf4_recs.c tst_utils.c -bm_many_atts_SOURCES = bm_many_atts.c tst_utils.c -bm_many_objs_SOURCES = bm_many_objs.c tst_utils.c -tst_ar4_3d_SOURCES = tst_ar4_3d.c tst_utils.c -tst_ar4_4d_SOURCES = tst_ar4_4d.c tst_utils.c -tst_files2_SOURCES = tst_files2.c tst_utils.c -tst_ar4_SOURCES = tst_ar4.c tst_utils.c -tst_h_many_atts_SOURCES = tst_h_many_atts.c tst_utils.c -bm_file_SOURCES = bm_file.c tst_utils.c -tst_knmi_SOURCES = tst_knmi.c tst_utils.c -tst_wrf_reads_SOURCES = tst_wrf_reads.c tst_utils.c +# bm_netcdf4_recs_SOURCES = bm_netcdf4_recs.c tst_utils.c +# bm_many_atts_SOURCES = bm_many_atts.c tst_utils.c +# bm_many_objs_SOURCES = bm_many_objs.c tst_utils.c +# tst_ar4_3d_SOURCES = tst_ar4_3d.c tst_utils.c +# tst_ar4_4d_SOURCES = tst_ar4_4d.c tst_utils.c +# tst_files2_SOURCES = tst_files2.c tst_utils.c +# tst_ar4_SOURCES = tst_ar4.c tst_utils.c +# tst_h_many_atts_SOURCES = tst_h_many_atts.c tst_utils.c +# bm_file_SOURCES = bm_file.c tst_utils.c +# tst_knmi_SOURCES = tst_knmi.c tst_utils.c +# tst_wrf_reads_SOURCES = tst_wrf_reads.c tst_utils.c -TESTS += tst_ar4_3d tst_create_files run_bm_elena.sh \ -run_tst_chunks.sh tst_files3 tst_mem run_knmi_bm.sh tst_wrf_reads \ -tst_attsperf +# TESTS += tst_ar4_3d tst_create_files run_bm_elena.sh \ +# run_tst_chunks.sh tst_files3 tst_mem run_knmi_bm.sh tst_wrf_reads \ +# tst_attsperf -run_bm_elena.log: tst_create_files.log tst_files.log +# run_bm_elena.log: tst_create_files.log tst_files.log -if BUILD_UTILITIES -TESTS += run_bm_test1.sh run_bm_test2.sh +# if BUILD_UTILITIES +# TESTS += run_bm_test1.sh run_bm_test2.sh -# tst_create_files creates files for other tests. -run_bm_test1.log: tst_create_files.log -run_bm_test2.log: tst_create_files.log +# # tst_create_files creates files for other tests. +# run_bm_test1.log: tst_create_files.log +# run_bm_test2.log: tst_create_files.log -# This will run a parallel I/O benchmark for parallel builds. -if TEST_PARALLEL4 -TESTS += run_par_bm_test.sh -run_par_bm_test.log: tst_create_files.log -endif # TEST_PARALLEL4 -endif # BUILD_UTILITIES -endif # BUILD_BENCHMARKS +# # This will run a parallel I/O benchmark for parallel builds. +# if TEST_PARALLEL4 +# TESTS += run_par_bm_test.sh +# run_par_bm_test.log: tst_create_files.log +# endif # TEST_PARALLEL4 +# endif # BUILD_UTILITIES +# endif # BUILD_BENCHMARKS # Szip Tests (requires ncdump) if USE_SZIP