diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2017-05-12 03:08:20 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2017-06-02 18:33:26 +0100 |
| commit | 097cc58d530e4e40482a4b981306200151088562 (patch) | |
| tree | 26ac94e3dee1bf1dfb21c921da7c96375f25dee0 /test/Makefile.am | |
| parent | loleaflet: click to reload idle document (diff) | |
| download | online-097cc58d530e4e40482a4b981306200151088562.tar.gz online-097cc58d530e4e40482a4b981306200151088562.zip | |
Run old-style unit tests as a new-style unit test.
This moves the code into the same process, for easier logging & debugging.
Disabled initially.
Change-Id: Id48b5649ba14deb0a2159ca59e321c7d0ae66dad
Diffstat (limited to 'test/Makefile.am')
| -rw-r--r-- | test/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 754f0f12cc..5062927705 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -14,7 +14,7 @@ AM_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTDOC=\"$(top_srcdir)/test/data\" \ noinst_LTLIBRARIES = \ unit-timeout.la unit-prefork.la \ - unit-storage.la \ + unit-storage.la unit-client.la \ unit-admin.la unit-tilecache.la \ unit-fuzz.la unit-oob.la @@ -56,6 +56,8 @@ unit_oob_la_SOURCES = UnitOOB.cpp unit_fuzz_la_SOURCES = UnitFuzz.cpp unit_admin_la_SOURCES = UnitAdmin.cpp unit_admin_la_LIBADD = $(CPPUNIT_LIBS) +unit_client_la_SOURCES = UnitClient.cpp ${test_SOURCES} +unit_client_la_LIBADD = $(CPPUNIT_LIBS) unit_timeout_la_SOURCES = UnitTimeout.cpp unit_prefork_la_SOURCES = UnitPrefork.cpp unit_storage_la_SOURCES = UnitStorage.cpp @@ -73,7 +75,7 @@ check-local: ./run_unit.sh --log-file test.log --trs-file test.trs # FIXME 2: unit-oob.la fails with symbol undefined: # UnitWSD::testHandleRequest(UnitWSD::TestRequest, UnitHTTPServerRequest&, UnitHTTPServerResponse&) , -TESTS = unit-prefork.la unit-tilecache.la unit-timeout.la # unit-storage.la # unit-admin.la +TESTS = unit-prefork.la unit-tilecache.la unit-timeout.la # unit-client.la - enable to run unit-tests in wsd ... else TESTS = ${top_builddir}/test/test endif |