don't allow benchmarks for classic only builds

This commit is contained in:
Ed Hartnett 2019-03-18 08:40:18 -06:00
parent e3c628482e
commit 94d9cd7c8f
4 changed files with 11 additions and 16 deletions

View File

@ -531,6 +531,9 @@ AC_ARG_ENABLE([benchmarks],
are timed. We use these tests to check netCDF performance.])]) are timed. We use these tests to check netCDF performance.])])
test "x$enable_benchmarks" = xyes || enable_benchmarks=no test "x$enable_benchmarks" = xyes || enable_benchmarks=no
AC_MSG_RESULT($enable_benchmarks) AC_MSG_RESULT($enable_benchmarks)
if test "x$enable_netcdf4" = xno ; then
AC_MSG_ERROR([Can't use benchmarks if netCDF-4 is disabled.])
fi
AM_CONDITIONAL(BUILD_BENCHMARKS, [test x$enable_benchmarks = xyes]) AM_CONDITIONAL(BUILD_BENCHMARKS, [test x$enable_benchmarks = xyes])
# Does the user want to use extreme numbers in testing. # Does the user want to use extreme numbers in testing.

View File

@ -26,11 +26,9 @@ FOREACH(CTEST ${NC4_TESTS})
add_bin_test(nc_test4 ${CTEST}) add_bin_test(nc_test4 ${CTEST})
ENDFOREACH() ENDFOREACH()
# IF(ENABLE_METADATA_PERF) build_bin_test(bigmeta)
# build_bin_test(bigmeta) build_bin_test(openbigmeta)
# build_bin_test(openbigmeta) build_bin_test(tst_attsperf)
# build_bin_test(tst_attsperf) add_sh_test(nc_test4 perftest)
# add_sh_test(nc_test4 perftest)
# ENDIF()
ADD_EXTRA_DIST(run_par_test.sh.in) ADD_EXTRA_DIST(run_par_test.sh.in)

View File

@ -2,10 +2,11 @@
# Corporation for Atmospheric Research/Unidata See COPYRIGHT file for # Corporation for Atmospheric Research/Unidata See COPYRIGHT file for
# conditions of use. # conditions of use.
# #
# This directory holds tests for netCDF-4. It is skipped if netCDF-4 # This directory holds performance tests for netCDF-4. It is only
# is not enabled. # built for netCDF-4 builds that use the --enable-benchmarks configure
# option.
# #
# Ed Hartnett, Ward Fisher # Ed Hartnett 3/18/19
# Put together AM_CPPFLAGS and AM_LDFLAGS. # Put together AM_CPPFLAGS and AM_LDFLAGS.
include $(top_srcdir)/lib_flags.am include $(top_srcdir)/lib_flags.am

View File

@ -91,11 +91,4 @@ IF(TEST_PARALLEL4)
add_sh_test(nc_test4 run_par_test) add_sh_test(nc_test4 run_par_test)
ENDIF() 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) ADD_EXTRA_DIST(findplugin.in run_par_test.sh.in)