Commit b126cf8d authored by Jeremy C. Reed's avatar Jeremy C. Reed

[trac1286] change check_PROGRAMS to noinst_PROGRAMS

And for check_LTLIBRARIES to noinst_LTLIBRARIES too.

This is so a regular "make" will build the test programs and
libraries too.  So the "make check" will just run the tests (and
not build them).  This is to help with test-driven development.

This reverses some from #1091, plus does the rest too.

Note that doing a "make check" before a "make" does not currently
work due to dependencies depending on each other (e.g. python/isc/log
tests needs datasrc but python/isc/datasrc tests need log_config_update).
parent 911cb21f
......@@ -67,4 +67,4 @@ run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
......@@ -60,4 +60,4 @@ run_unittests_CXXFLAGS += -Wno-unused-parameter
endif
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
......@@ -21,4 +21,4 @@ run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.
run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libutil_io.la
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
......@@ -37,4 +37,4 @@ run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
run_unittests_LDADD += $(top_builddir)/src/lib/acl/libdnsacl.la
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
......@@ -47,4 +47,4 @@ run_unittests_CXXFLAGS += -Wno-error
endif
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
......@@ -53,4 +53,4 @@ run_unittests_CXXFLAGS += -Wno-error
endif
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
......@@ -22,6 +22,6 @@ run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
run_unittests_LDADD += $(GTEST_LDADD)
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
EXTRA_DIST = testdata/query.txt
......@@ -62,7 +62,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
EXTRA_DIST = testdata/message_cname_referral.wire
EXTRA_DIST += testdata/message_example_com_soa.wire
......
......@@ -32,4 +32,4 @@ run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
......@@ -31,4 +31,4 @@ run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
......@@ -24,4 +24,4 @@ run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
......@@ -62,7 +62,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/testutils/libtestutils.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
EXTRA_DIST = testdata/brokendb.sqlite3
EXTRA_DIST += testdata/example.com.signed
......
......@@ -71,4 +71,4 @@ run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
......@@ -20,4 +20,4 @@ run_unittests_LDADD = $(GTEST_LDADD)
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
......@@ -45,7 +45,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
endif
check_PROGRAMS = logger_example
noinst_PROGRAMS = logger_example
logger_example_SOURCES = logger_example.cc
logger_example_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
logger_example_LDFLAGS = $(AM_LDFLAGS) $(LOG4CPLUS_LDFLAGS)
......@@ -53,7 +53,7 @@ logger_example_LDADD = $(top_builddir)/src/lib/log/liblog.la
logger_example_LDADD += $(top_builddir)/src/lib/util/libutil.la
logger_example_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
check_PROGRAMS += init_logger_test
noinst_PROGRAMS += init_logger_test
init_logger_test_SOURCES = init_logger_test.cc
init_logger_test_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
init_logger_test_LDFLAGS = $(AM_LDFLAGS) $(LOG4CPLUS_LDFLAGS)
......@@ -61,7 +61,7 @@ init_logger_test_LDADD = $(top_builddir)/src/lib/log/liblog.la
init_logger_test_LDADD += $(top_builddir)/src/lib/util/libutil.la
init_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
check_PROGRAMS += $(TESTS)
noinst_PROGRAMS += $(TESTS)
# Additional test using the shell. These are principally tests
# where the global logging environment is affected, and where the
......
......@@ -60,4 +60,4 @@ run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
......@@ -38,4 +38,4 @@ run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
......@@ -49,6 +49,6 @@ run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
run_unittests_LDADD += $(top_builddir)/src/lib/config/tests/libfake_session.la
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
EXTRA_DIST = testdata/spec.spec
......@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS)
check_LTLIBRARIES = pyunittests_util.la
noinst_LTLIBRARIES = pyunittests_util.la
pyunittests_util_la_SOURCES = pyunittests_util.cc
pyunittests_util_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_INCLUDES)
......
......@@ -40,4 +40,4 @@ run_unittests_LDADD += \
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CXXFLAGS = $(B10_CXXFLAGS)
check_LTLIBRARIES = libutil_unittests.la
noinst_LTLIBRARIES = libutil_unittests.la
libutil_unittests_la_SOURCES = fork.h fork.cc resolver.h
libutil_unittests_la_SOURCES += newhook.h newhook.cc
libutil_unittests_la_SOURCES += testdata.h testdata.cc
......
......@@ -12,7 +12,7 @@ endif
CLEANFILES = *.gcno *.gcda
check_PROGRAMS = badpacket
noinst_PROGRAMS = badpacket
badpacket_SOURCES = badpacket.cc
badpacket_SOURCES += command_options.cc command_options.h
badpacket_SOURCES += header_flags.h
......
......@@ -29,4 +29,4 @@ run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
endif
check_PROGRAMS = $(TESTS)
noinst_PROGRAMS = $(TESTS)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment