From 74519d550bc0d04b1de61a57250b97a9ed095698 Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Sat, 4 Nov 2017 08:12:48 -0600 Subject: [PATCH] moved tests dependant on ncdump inside BUILD_UTILITIES block in Makefile.am files --- dap4_test/Makefile.am | 4 ++-- ncdap_test/Makefile.am | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dap4_test/Makefile.am b/dap4_test/Makefile.am index 753476895..733020c0f 100644 --- a/dap4_test/Makefile.am +++ b/dap4_test/Makefile.am @@ -25,12 +25,12 @@ test_parse_SOURCES = test_parse.c test_common.h test_meta_SOURCES = test_meta.c test_common.h test_data_SOURCES = test_data.c test_common.h TESTS += test_parse.sh -TESTS += test_meta.sh -TESTS += test_data.sh if BUILD_UTILITIES # These rely on ncdump TESTS += test_raw.sh +TESTS += test_meta.sh +TESTS += test_data.sh endif if ENABLE_DAP_REMOTE_TESTS diff --git a/ncdap_test/Makefile.am b/ncdap_test/Makefile.am index 3ed2849c3..dad689349 100644 --- a/ncdap_test/Makefile.am +++ b/ncdap_test/Makefile.am @@ -27,7 +27,9 @@ test_vara_SOURCES = test_vara.c t_srcdir.h if ENABLE_DAP check_PROGRAMS += t_dap3a test_cvt3 test_vara TESTS += t_dap3a test_cvt3 test_vara +if BUILD_UTILITIES TESTS += tst_ncdap3.sh +endif # remote tests are optional # because the server may be down or inaccessible @@ -37,10 +39,10 @@ check_PROGRAMS += findtestserver findtestserver_SOURCES = findtestserver.c if BUILD_UTILITIES -TESTS += tst_ber.sh tst_remote3.sh tst_formatx.sh +TESTS += tst_ber.sh tst_remote3.sh tst_formatx.sh testurl.sh endif -TESTS += test_partvar testurl.sh +TESTS += test_partvar if ENABLE_DAP_LONG_TESTS TESTS += tst_longremote3.sh