[Libreoffice-commits] online.git: test/Makefile.am

Ashod Nakashian ashod.nakashian at collabora.co.uk
Mon Dec 19 05:45:00 UTC 2016


 test/Makefile.am |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8099b84c3e07d0a81db37b5bc4f3cf686125afbd
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sat Dec 17 09:54:19 2016 -0500

    loolwsd: run whitebox unittests with `make check`
    
    Change-Id: I4354e1f42f33a5b2181a895077e1e16abb4e2c99
    Reviewed-on: https://gerrit.libreoffice.org/32154
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/test/Makefile.am b/test/Makefile.am
index 68f8c81..287b09d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -41,15 +41,15 @@ wsd_sources = \
             ../common/Unit.cpp \
             ../common/Util.cpp
 
-test_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS
-test_SOURCES = TileCacheTests.cpp integration-http-server.cpp \
-               httpwstest.cpp httpcrashtest.cpp httpwserror.cpp test.cpp $(wsd_sources)
-test_LDADD = $(CPPUNIT_LIBS)
-
 unittest_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS
 unittest_SOURCES = TileQueueTests.cpp WhiteBoxTests.cpp test.cpp $(wsd_sources)
 unittest_LDADD = $(CPPUNIT_LIBS)
 
+test_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS
+test_SOURCES = TileCacheTests.cpp integration-http-server.cpp \
+               httpwstest.cpp httpcrashtest.cpp httpwserror.cpp $(unittest_SOURCES)
+test_LDADD = $(CPPUNIT_LIBS)
+
 # unit test modules:
 unit_oob_la_SOURCES = UnitOOB.cpp
 unit_fuzz_la_SOURCES = UnitFuzz.cpp


More information about the Libreoffice-commits mailing list