diff options
Diffstat (limited to 'gcell')
| -rw-r--r-- | gcell/apps/Makefile.am | 4 | ||||
| -rw-r--r-- | gcell/apps/test_all.cc | 13 | ||||
| -rw-r--r-- | gcell/gcell.pc.in | 4 | ||||
| -rw-r--r-- | gcell/lib/Makefile.am | 10 |
4 files changed, 15 insertions, 16 deletions
diff --git a/gcell/apps/Makefile.am b/gcell/apps/Makefile.am index 7cf9122a3..c3a2092a3 100644 --- a/gcell/apps/Makefile.am +++ b/gcell/apps/Makefile.am @@ -22,9 +22,7 @@ include $(top_srcdir)/Makefile.common SUBDIRS = spu . -AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_INCLUDES) \ - $(GCELL_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) - +AM_CPPFLAGS = $(DEFINES) $(GCELL_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) GCELL_QA_LA = $(top_builddir)/gcell/lib/libgcell-qa.la diff --git a/gcell/apps/test_all.cc b/gcell/apps/test_all.cc index 9823960c4..0b608e13b 100644 --- a/gcell/apps/test_all.cc +++ b/gcell/apps/test_all.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -20,18 +20,25 @@ */ #include <cppunit/TextTestRunner.h> +#include <cppunit/XmlOutputter.h> +#include <gr_unittests.h> #include "../lib/runtime/qa_gcell_runtime.h" #include "../lib/wrapper/qa_gcell_wrapper.h" int main(int argc, char **argv) { - - CppUnit::TextTestRunner runner; + char path[200]; + get_unittest_path ("gcell_all.xml", path, 200); + + CppUnit::TextTestRunner runner; + std::ofstream xmlfile(path); + CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile); runner.addTest(qa_gcell_runtime::suite()); runner.addTest(qa_gcell_wrapper::suite()); + runner.setOutputter(xmlout); bool was_successful = runner.run("", false); diff --git a/gcell/gcell.pc.in b/gcell/gcell.pc.in index d88d0fb67..1a3cd9c26 100644 --- a/gcell/gcell.pc.in +++ b/gcell/gcell.pc.in @@ -6,7 +6,7 @@ gcell_embedspu_libtool=@bindir@/gcell-embedspu-libtool Name: gcell Description: The GNU Radio SPE scheduler and RPC mechanism -Requires: gnuradio-omnithread -Version: @VERSION@ +Requires: +Version: @LIBVER@ Libs: -L${libdir} -lgcell Cflags: -I${includedir} @DEFINES@ diff --git a/gcell/lib/Makefile.am b/gcell/lib/Makefile.am index fa9c4a003..7a727ea84 100644 --- a/gcell/lib/Makefile.am +++ b/gcell/lib/Makefile.am @@ -27,10 +27,10 @@ SUBDIRS = spu runtime general wrapper . lib_LTLIBRARIES = libgcell.la libgcell-qa.la libgcell_la_SOURCES = -libgcell_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 +libgcell_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) libgcell_qa_la_SOURCES = -libgcell_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 +libgcell_qa_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) libgcell_la_LIBADD = \ runtime/libruntime.la \ @@ -42,9 +42,3 @@ libgcell_qa_la_LIBADD = \ runtime/libruntime-qa.la \ wrapper/libwrapper-qa.la \ $(CPPUNIT_LIBS) - - - - - - |