From 336b7d7222501cb621f299b20b7b811dddb86b69 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Sat, 9 Apr 2022 13:28:01 -0600 Subject: [PATCH] turning off tests that depend on ncpathcvt when --disable-utilities is used --- examples/C/Makefile.am | 2 ++ nctest/Makefile.am | 9 ++++++--- nczarr_test/Makefile.am | 6 +++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/examples/C/Makefile.am b/examples/C/Makefile.am index 5d5f7e2e7..e9f087ada 100644 --- a/examples/C/Makefile.am +++ b/examples/C/Makefile.am @@ -33,11 +33,13 @@ check_PROGRAMS += simple_nc4_wr simple_nc4_rd simple_xy_nc4_wr \ simple_xy_nc4_rd TESTS += run_examples4.sh +if BUILD_UTILITIES if ENABLE_FILTER_TESTING # filter_example.c should be same as nc_test4/test_filter.c check_PROGRAMS += filter_example TESTS += run_filter.sh endif +endif endif #USE_HDF5 diff --git a/nctest/Makefile.am b/nctest/Makefile.am index 9532399a2..47b9281c4 100644 --- a/nctest/Makefile.am +++ b/nctest/Makefile.am @@ -30,14 +30,17 @@ nctest_classic.cdl ref_nctest_classic.cdl # reference file. TESTPROGRAMS = nctest tst_rename check_PROGRAMS = $(TESTPROGRAMS) + +# This test requires that the utilites also be built. +if BUILD_UTILITIES TESTS = $(TESTPROGRAMS) compare_test_files.sh +# compare_test_files depends on nctest executing first. +compare_test_files.log: nctest.log +endif # Note which tests depend on other tests. Necessary for make -j check. TEST_EXTENSIONS = .sh -# compare_test_files depends on nctest executing first. -compare_test_files.log: nctest.log - # These are the source files for the nctest program. nctest_SOURCES = add.c add.h atttests.c cdftests.c dimtests.c driver.c \ emalloc.c emalloc.h error.c error.h misctest.c rec.c slabs.c testcdf.h \ diff --git a/nczarr_test/Makefile.am b/nczarr_test/Makefile.am index a7ca56d36..c7c15565d 100644 --- a/nczarr_test/Makefile.am +++ b/nczarr_test/Makefile.am @@ -37,13 +37,13 @@ tst_fillonlyz_SOURCES = tst_fillonlyz.c ${tstcommonsrc} check_PROGRAMS += tst_zchunks tst_zchunks2 tst_zchunks3 tst_fillonlyz test_quantize -TESTS += run_ut_map.sh -TESTS += run_ut_mapapi.sh -TESTS += run_ut_misc.sh TESTS += run_ut_chunk.sh if BUILD_UTILITIES +TESTS += run_ut_map.sh +TESTS += run_ut_mapapi.sh +TESTS += run_ut_misc.sh TESTS += run_ncgen4.sh if USE_HDF5