From fd5ac15ebc643635e436b64cf1e656284380b1a5 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 11 Jun 2006 12:18:23 +0000 Subject: * test/qt/*: Update the testcases, including testing the new functionality of sending null QByteArray and QString over the bus. Add new headertest test and restore the old qdbusxmlparser test. --- test/qt/Makefile.am | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'test/qt/Makefile.am') diff --git a/test/qt/Makefile.am b/test/qt/Makefile.am index f7a8efa9..8ebd3323 100644 --- a/test/qt/Makefile.am +++ b/test/qt/Makefile.am @@ -1,7 +1,7 @@ INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/qt $(DBUS_CLIENT_CFLAGS) $(DBUS_QT_CFLAGS) $(DBUS_QTESTLIB_CFLAGS) -DDBUS_COMPILATION if DBUS_BUILD_TESTS -TEST_BINARIES=qdbusconnection qpong ping qdbusinterface qdbusabstractadaptor hal +TEST_BINARIES = tst_headertest tst_qdbusxmlparser tst_qdbusconnection qpong tst_qdbusmarshall tst_qdbusinterface tst_qdbusabstractadaptor tst_hal TESTS= else TEST_BINARIES= @@ -11,14 +11,17 @@ endif noinst_PROGRAMS= $(TEST_BINARIES) qpong_SOURCES= qpong.cpp -ping_SOURCES= ping.cpp -qdbusconnection_SOURCES= tst_qdbusconnection.cpp -qdbusinterface_SOURCES= tst_qdbusinterface.cpp -qdbusabstractadaptor_SOURCES= tst_qdbusabstractadaptor.cpp common.h -hal_SOURCES = tst_hal.cpp +tst_headertest_SOURCES = tst_headertest.cpp +tst_qdbusconnection_SOURCES = tst_qdbusconnection.cpp +tst_qdbusxmlparser_SOURCES = tst_qdbusxmlparser.cpp +tst_qdbusmarshall_SOURCES = tst_qdbusmarshall.cpp +tst_qdbusinterface_SOURCES = tst_qdbusinterface.cpp +tst_qdbusabstractadaptor_SOURCES = tst_qdbusabstractadaptor.cpp common.h +tst_hal_SOURCES = tst_hal.cpp qpong.o: qpong.moc -ping.o: ping.moc +tst_qdbusxmlparser.o: tst_qdbusxmlparser.moc +tst_qdbusmarshall.o: tst_qdbusmarshall.moc tst_qdbusconnection.o: tst_qdbusconnection.moc tst_qdbusinterface.o: tst_qdbusinterface.moc tst_qdbusabstractadaptor.o: tst_qdbusabstractadaptor.moc @@ -27,7 +30,7 @@ tst_hal.o: tst_hal.moc %.moc: %.cpp $(QT_MOC) $< > $@ -TEST_LIBS=$(DBUS_QTESTLIB_LIBS) $(top_builddir)/qt/libdbus-qt4-1.la +TEST_LIBS=$(DBUS_QTESTLIB_LIBS) $(top_builddir)/qt/src/libdbus-qt4-1.la LDADD=$(TEST_LIBS) -- cgit