diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2020-01-17 21:18:42 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2020-01-21 15:07:54 +0000 |
| commit | 8f91659ae08290c30a56143cb2f0400739a2bafd (patch) | |
| tree | 9f0209f009487ce11b3266a56b40d51f51b53e7f /test/Makefile.am | |
| parent | 9dfac6dab13f59e418e81933be4c02396dd46c40 (diff) | |
test: dung out redundant LOOL_TEST_CLIENT_PORT.
And cleanup other related oddities.
Change-Id: I2d179a2ece6a8553e10e406ad4e5da08a2ff58e5
Diffstat (limited to 'test/Makefile.am')
| -rw-r--r-- | test/Makefile.am | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 2b369465a..e10cb7d8c 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2,12 +2,10 @@ export MAX_CONCURRENCY=4 AUTOMAKE_OPTION = serial-tests -# unittest: tests that do not need loolwsd running, and that are run during a -# normal build -# test: tests that need loolwsd running, and that are run via 'make check' -check_PROGRAMS = test fakesockettest +# unittest: tests that run a captive loolwsd as part of themselves. +check_PROGRAMS = fakesockettest -noinst_PROGRAMS = test fakesockettest unittest +noinst_PROGRAMS = fakesockettest unittest AM_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTDOC=\"$(abs_top_srcdir)/test/data\" \ -I${top_srcdir}/common -I${top_srcdir}/net -I${top_srcdir}/wsd -I${top_srcdir}/kit @@ -87,10 +85,6 @@ unittest_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS unittest_SOURCES = $(test_base_source) test.cpp unittest_LDADD = $(CPPUNIT_LIBS) -test_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS -test_SOURCES = $(test_all_source) test.cpp -test_LDADD = $(CPPUNIT_LIBS) - fakesockettest_SOURCES = fakesockettest.cpp ../net/FakeSocket.cpp fakesockettest_LDADD = $(CPPUNIT_LIBS) |