From 7db0ba61d8568c5cebbce363e6ff33bc58f0267a Mon Sep 17 00:00:00 2001
From: Christian Thaeter <ct@pipapo.org>
Date: Tue, 23 Dec 2008 07:02:38 +0100
Subject: [PATCH] move tests from 'tests/lumiera' to 'tests/common' to reflect
 src layout

---
 tests/Makefile.am                           | 18 +++++++++++++-----
 tests/{lumiera => common}/hello_interface.h |  0
 tests/{lumiera => common}/test-config.c     |  0
 tests/{lumiera => common}/test-interfaces.c |  2 +-
 tests/plugin/example_plugin.c               |  2 +-
 5 files changed, 15 insertions(+), 7 deletions(-)
 rename tests/{lumiera => common}/hello_interface.h (100%)
 rename tests/{lumiera => common}/test-config.c (100%)
 rename tests/{lumiera => common}/test-interfaces.c (99%)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 77a3db49f..3a2755ef2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -60,12 +60,20 @@ test_filehandles_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
 test_filehandles_LDADD = liblumierabackend.la liblumiera.la $(NOBUGMT_LUMIERA_LIBS)     liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
 
 
-
-
 check_PROGRAMS += test-config
-test_config_SOURCES = $(tests_srcdir)/lumiera/test-config.c
+test_config_SOURCES = $(tests_srcdir)/common/test-config.c
 test_config_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
-test_config_LDADD = liblumiera.la $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS)     liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
+test_config_LDADD =				\
+	liblumieraproc.la			\
+	liblumieracommon.la			\
+	liblumiera.la				\
+	$(LUMIERA_PLUGIN_LIBS)			\
+	$(NOBUGMT_LUMIERA_LIBS)			\
+	-ldl					\
+	-lboost_program_options-mt		\
+	-lboost_regex-mt
+
+
 
 check_LTLIBRARIES += examplepluginc.la
 examplepluginc_la_SOURCES = $(tests_srcdir)/plugin/example_plugin.c
@@ -73,7 +81,7 @@ examplepluginc_la_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -DLUMIERA_P
 examplepluginc_la_LDFLAGS = -module -avoid-version -no-undefined -rpath /dev/null
 
 check_PROGRAMS += test-interfaces
-test_interfaces_SOURCES = $(tests_srcdir)/lumiera/test-interfaces.c
+test_interfaces_SOURCES = $(tests_srcdir)/common/test-interfaces.c
 test_interfaces_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
 test_interfaces_LDADD = liblumiera.la $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS)      liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
 test_interfaces_DEPENDENCIES = examplepluginc.la liblumiera.la 
diff --git a/tests/lumiera/hello_interface.h b/tests/common/hello_interface.h
similarity index 100%
rename from tests/lumiera/hello_interface.h
rename to tests/common/hello_interface.h
diff --git a/tests/lumiera/test-config.c b/tests/common/test-config.c
similarity index 100%
rename from tests/lumiera/test-config.c
rename to tests/common/test-config.c
diff --git a/tests/lumiera/test-interfaces.c b/tests/common/test-interfaces.c
similarity index 99%
rename from tests/lumiera/test-interfaces.c
rename to tests/common/test-interfaces.c
index e68153991..d11214af3 100644
--- a/tests/lumiera/test-interfaces.c
+++ b/tests/common/test-interfaces.c
@@ -26,7 +26,7 @@
 #include "common/config_interface.h"
 
 #include "tests/test.h"
-#include "tests/lumiera/hello_interface.h"
+#include "tests/common/hello_interface.h"
 
 /*
   define 2 example interfaces
diff --git a/tests/plugin/example_plugin.c b/tests/plugin/example_plugin.c
index bd4a1f76d..60992745d 100644
--- a/tests/plugin/example_plugin.c
+++ b/tests/plugin/example_plugin.c
@@ -26,7 +26,7 @@
 #include "common/interfacedescriptor.h"
 #include "common/config_interface.h"
 
-#include "tests/lumiera/hello_interface.h"
+#include "tests/common/hello_interface.h"
 
 
 LUMIERA_PLUGIN_INTERFACEHANDLE;