From 63346c7dff3043762efb676bbfb21c077d48d09e Mon Sep 17 00:00:00 2001 From: Christian Thaeter Date: Wed, 13 Jan 2010 10:25:33 +0100 Subject: [PATCH] Fix remaining test, forgot to link tests in --- src/proc/Makefile.am | 1 + tests/components/Makefile.am | 104 +++++++++++++++++++---------------- tests/lib/Makefile.am | 7 +++ 3 files changed, 64 insertions(+), 48 deletions(-) diff --git a/src/proc/Makefile.am b/src/proc/Makefile.am index 51371e560..7d4d331df 100644 --- a/src/proc/Makefile.am +++ b/src/proc/Makefile.am @@ -172,6 +172,7 @@ liblumiprocmobjectsession_la_SOURCES = \ $(liblumiprocmobjectsession_la_srcdir)/mobjectfactory.cpp \ $(liblumiprocmobjectsession_la_srcdir)/placement-index.cpp \ $(liblumiprocmobjectsession_la_srcdir)/query-resolver.cpp \ + $(liblumiprocmobjectsession_la_srcdir)/query-focus.cpp \ $(liblumiprocmobjectsession_la_srcdir)/placement-index-query-resolver.cpp \ $(liblumiprocmobjectsession_la_srcdir)/session-services.cpp \ $(liblumiprocmobjectsession_la_srcdir)/root.cpp \ diff --git a/tests/components/Makefile.am b/tests/components/Makefile.am index c29ee5274..04eb5a685 100644 --- a/tests/components/Makefile.am +++ b/tests/components/Makefile.am @@ -33,59 +33,67 @@ test_components_LDADD = \ liblumiera.la \ $(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt -test_components_SOURCES = \ - $(testcomponents_srcdir)/backend/mediaaccessmock.cpp \ - $(testcomponents_srcdir)/backend/mediaaccessmocktest.cpp \ - $(testcomponents_srcdir)/proc/asset/assetcategorytest.cpp \ - $(testcomponents_srcdir)/proc/asset/compoundmediatest.cpp \ - $(testcomponents_srcdir)/proc/asset/deleteassettest.cpp \ - $(testcomponents_srcdir)/proc/asset/identityofassetstest.cpp \ - $(testcomponents_srcdir)/proc/asset/mediastructurequerytest.cpp \ - $(testcomponents_srcdir)/proc/asset/basicpipetest.cpp \ - $(testcomponents_srcdir)/proc/asset/createassettest.cpp \ - $(testcomponents_srcdir)/proc/asset/dependent-assets-test.cpp \ - $(testcomponents_srcdir)/proc/asset/makecliptest.cpp \ - $(testcomponents_srcdir)/proc/asset/orderingofassetstest.cpp \ - $(testcomponents_srcdir)/proc/asset/testasset.cpp \ - $(testcomponents_srcdir)/proc/control/command-basic-test.cpp \ - $(testcomponents_srcdir)/proc/control/command-argument-test.cpp \ - $(testcomponents_srcdir)/proc/control/command-equality-test.cpp \ - $(testcomponents_srcdir)/proc/control/command-mutation-test.cpp \ - $(testcomponents_srcdir)/proc/control/command-clone-builder-test.cpp \ - $(testcomponents_srcdir)/proc/control/command-use1-test.cpp \ - $(testcomponents_srcdir)/proc/control/command-use2-test.cpp \ - $(testcomponents_srcdir)/proc/control/command-use3-test.cpp \ - $(testcomponents_srcdir)/proc/control/command-binding-test.cpp \ - $(testcomponents_srcdir)/proc/control/command-registry-test.cpp \ - $(testcomponents_srcdir)/proc/control/test-dummy-commands.cpp \ - $(testcomponents_srcdir)/proc/control/argument-tuple-accept-test.cpp \ - $(testcomponents_srcdir)/proc/control/memento-tie-test.cpp \ +test_components_SOURCES = \ + $(testcomponents_srcdir)/backend/mediaaccessmock.cpp \ + $(testcomponents_srcdir)/backend/mediaaccessmocktest.cpp \ + $(testcomponents_srcdir)/proc/asset/assetcategorytest.cpp \ + $(testcomponents_srcdir)/proc/asset/compoundmediatest.cpp \ + $(testcomponents_srcdir)/proc/asset/deleteassettest.cpp \ + $(testcomponents_srcdir)/proc/asset/identityofassetstest.cpp \ + $(testcomponents_srcdir)/proc/asset/mediastructurequerytest.cpp \ + $(testcomponents_srcdir)/proc/asset/basicpipetest.cpp \ + $(testcomponents_srcdir)/proc/asset/createassettest.cpp \ + $(testcomponents_srcdir)/proc/asset/dependent-assets-test.cpp \ + $(testcomponents_srcdir)/proc/asset/makecliptest.cpp \ + $(testcomponents_srcdir)/proc/asset/orderingofassetstest.cpp \ + $(testcomponents_srcdir)/proc/asset/testasset.cpp \ + $(testcomponents_srcdir)/proc/control/command-basic-test.cpp \ + $(testcomponents_srcdir)/proc/control/command-argument-test.cpp \ + $(testcomponents_srcdir)/proc/control/command-equality-test.cpp \ + $(testcomponents_srcdir)/proc/control/command-mutation-test.cpp \ + $(testcomponents_srcdir)/proc/control/command-clone-builder-test.cpp \ + $(testcomponents_srcdir)/proc/control/command-use1-test.cpp \ + $(testcomponents_srcdir)/proc/control/command-use2-test.cpp \ + $(testcomponents_srcdir)/proc/control/command-use3-test.cpp \ + $(testcomponents_srcdir)/proc/control/command-binding-test.cpp \ + $(testcomponents_srcdir)/proc/control/command-registry-test.cpp \ + $(testcomponents_srcdir)/proc/control/test-dummy-commands.cpp \ + $(testcomponents_srcdir)/proc/control/argument-tuple-accept-test.cpp \ + $(testcomponents_srcdir)/proc/control/memento-tie-test.cpp \ $(testcomponents_srcdir)/proc/control/handling-pattern-basics-test.cpp \ $(testcomponents_srcdir)/proc/control/handling-pattern-standard-impl-test.cpp \ - $(testcomponents_srcdir)/proc/engine/buff-table-test.cpp \ - $(testcomponents_srcdir)/proc/engine/node-basic-test.cpp \ - $(testcomponents_srcdir)/proc/engine/node-fabrication-test.cpp \ - $(testcomponents_srcdir)/proc/engine/node-operation-test.cpp \ - $(testcomponents_srcdir)/proc/engine/node-source-test.cpp \ - $(testcomponents_srcdir)/proc/mobject/builder/buildertooltest.cpp \ - $(testcomponents_srcdir)/proc/mobject/builder/buildsegmenttest.cpp \ - $(testcomponents_srcdir)/proc/mobject/controller/rendersegmenttest.cpp \ - $(testcomponents_srcdir)/proc/mobject/mobject-ref-test.cpp \ - $(testcomponents_srcdir)/proc/mobject/placement-basic-test.cpp \ - $(testcomponents_srcdir)/proc/mobject/placement-hierarchy-test.cpp \ - $(testcomponents_srcdir)/proc/mobject/placement-ref-test.cpp \ + $(testcomponents_srcdir)/proc/engine/buff-table-test.cpp \ + $(testcomponents_srcdir)/proc/engine/node-basic-test.cpp \ + $(testcomponents_srcdir)/proc/engine/node-fabrication-test.cpp \ + $(testcomponents_srcdir)/proc/engine/node-operation-test.cpp \ + $(testcomponents_srcdir)/proc/engine/node-source-test.cpp \ + $(testcomponents_srcdir)/proc/mobject/builder/buildertooltest.cpp \ + $(testcomponents_srcdir)/proc/mobject/builder/buildsegmenttest.cpp \ + $(testcomponents_srcdir)/proc/mobject/controller/rendersegmenttest.cpp \ + $(testcomponents_srcdir)/proc/mobject/mobject-ref-test.cpp \ + $(testcomponents_srcdir)/proc/mobject/placement-basic-test.cpp \ + $(testcomponents_srcdir)/proc/mobject/placement-hierarchy-test.cpp \ + $(testcomponents_srcdir)/proc/mobject/placement-ref-test.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/test-scopes.cpp \ $(testcomponents_srcdir)/proc/mobject/session/placement-index-test.cpp \ - $(testcomponents_srcdir)/proc/mobject/session/addcliptest.cpp \ - $(testcomponents_srcdir)/proc/mobject/session/deletecliptest.cpp \ - $(testcomponents_srcdir)/proc/mobject/session/rebuildfixturetest.cpp \ - $(testcomponents_srcdir)/proc/mobject/session/sessionmanagertest.cpp \ - $(testcomponents_srcdir)/proc/mobject/session/testclip.cpp \ - $(testcomponents_srcdir)/proc/mobject/session/defsmanagerimpltest.cpp \ - $(testcomponents_srcdir)/proc/mobject/session/defsmanagertest.cpp \ - $(testcomponents_srcdir)/proc/mobject/session/defsregistryimpltest.cpp \ - $(testcomponents_srcdir)/proc/mobject/session/sessionstructuretest.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/addcliptest.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/deletecliptest.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/rebuildfixturetest.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/sessionmanagertest.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/testclip.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/defsmanagerimpltest.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/defsmanagertest.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/defsregistryimpltest.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/sessionstructuretest.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/scope-query-test.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/placement-index-query-test.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/query-focus-stack-test.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/query-resolver-test.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/query-focus-test.cpp \ + $(testcomponents_srcdir)/proc/mobject/session/session-service-access-test.cpp \ $(testcomponents_srcdir)/mainsuite.cpp + noinst_HEADERS += \ $(testcomponents_srcdir)/backend/mediaaccessmock.hpp \ $(testcomponents_srcdir)/proc/asset/testclipasset.hpp \ diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 7362c6caf..d3626c720 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -46,11 +46,16 @@ test_lib_SOURCES = \ $(testlib_srcdir)/factorytest.cpp \ $(testlib_srcdir)/format-helper-test.cpp \ $(testlib_srcdir)/functor-util-test.cpp \ + $(testlib_srcdir)/util-foreach-test.cpp \ $(testlib_srcdir)/hash-indexed-test.cpp \ $(testlib_srcdir)/helloworldtest.cpp \ $(testlib_srcdir)/lifecycletest.cpp \ $(testlib_srcdir)/multifact-test.cpp \ + $(testlib_srcdir)/multifact-argument-test.cpp \ $(testlib_srcdir)/iter-adapter-test.cpp \ + $(testlib_srcdir)/item-wrapper-test.cpp \ + $(testlib_srcdir)/itertools-test.cpp \ + $(testlib_srcdir)/iter-source-test.cpp \ $(testlib_srcdir)/meta/typelist-test.cpp \ $(testlib_srcdir)/meta/typelist-manip-test.cpp \ $(testlib_srcdir)/meta/typeseq-manip-test.cpp \ @@ -60,6 +65,8 @@ test_lib_SOURCES = \ $(testlib_srcdir)/meta/function-erasure-test.cpp \ $(testlib_srcdir)/meta/generator-test.cpp \ $(testlib_srcdir)/meta/config-flags-test.cpp \ + $(testlib_srcdir)/meta/duck-detector-test.cpp \ + $(testlib_srcdir)/meta/iterable-classification-test.cpp \ $(testlib_srcdir)/query/queryutilstest.cpp \ $(testlib_srcdir)/removefromsettest.cpp \ $(testlib_srcdir)/sanitised-identifier-test.cpp \