tests: Move test code

Move tests that are actually examples into a new examples folder and move
everything in gtest folder into test.

Signed-off-by: Jens Georg <mail@jensge.org>

11 files changed, 34 insertions, 36 deletions

diff --git a/Makefile.am b/Makefile.am
index f5aba61..7363921 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ else
 TOOLS_DIR =
 endif
 
-SUBDIRS = libgssdp $(TOOLS_DIR) tests doc vala
+SUBDIRS = libgssdp $(TOOLS_DIR) tests examples doc vala
 
 ACLOCAL_AMFLAGS=${ACLOCAL_FLAGS} -I m4
 
diff --git a/configure.ac b/configure.ac
index 86b2851..4c08d4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,7 +162,7 @@ Makefile
 libgssdp/Makefile
 tools/Makefile
 tests/Makefile
-tests/gtest/Makefile
+examples/Makefile
 vala/Makefile
 doc/Makefile
 doc/version.xml
diff --git a/examples/Makefile.am b/examples/Makefile.am
new file mode 100644
index 0000000..9f47337
--- /dev/null
+++ b/examples/Makefile.am
@@ -0,0 +1,13 @@
+AM_CFLAGS = $(LIBGSSDP_CFLAGS) -I$(top_srcdir)
+
+noinst_PROGRAMS = test-browser test-publish
+
+test_browser_SOURCES = test-browser.c
+test_browser_LDADD   = $(top_builddir)/libgssdp/libgssdp-1.0.la $(LIBGSSDP_LIBS)
+
+test_publish_SOURCES = test-publish.c
+test_publish_LDADD   = $(top_builddir)/libgssdp/libgssdp-1.0.la $(LIBGSSDP_LIBS)
+
+CLEANFILES = $(BUILT_SOURCES)
+DISTCLEANFILES = $(BUILT_SOURCES)
+MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)
diff --git a/tests/test-browser.c b/examples/test-browser.c
index 91feaca..91feaca 100644
--- a/tests/test-browser.c
+++ b/examples/test-browser.c
diff --git a/tests/test-publish.c b/examples/test-publish.c
index e77ca4c..e77ca4c 100644
--- a/tests/test-publish.c
+++ b/examples/test-publish.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5c0809f..722f058 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,15 +1,24 @@
-SUBDIRS = gtest
+TESTS_ENVIRONMENT = G_SLICE=debug-blocks \
+		    LD_LIBRARY_PATH=$(top_builddir)/libgssdp/.libs:$(LD_LIBRARY_PATH)
 
-AM_CFLAGS = $(LIBGSSDP_CFLAGS) -I$(top_srcdir)
+TESTS=$(check_PROGRAMS)
 
-noinst_PROGRAMS = test-browser test-publish
+check_PROGRAMS = test-regression test-functional
 
-test_browser_SOURCES = test-browser.c
-test_browser_LDADD   = $(top_builddir)/libgssdp/libgssdp-1.0.la $(LIBGSSDP_LIBS)
+noinst_LIBRARIES = libtestutil.a
 
-test_publish_SOURCES = test-publish.c
-test_publish_LDADD   = $(top_builddir)/libgssdp/libgssdp-1.0.la $(LIBGSSDP_LIBS)
+libtestutil_a_SOURCES = test-util.h test-util.c
+
+test_regression_SOURCES = test-regression.c
+test_functional_SOURCES = test-functional.c
+
+LDADD = \
+	$(top_builddir)/libgssdp/libgssdp-1.0.la \
+	libtestutil.a \
+	$(LIBGSSDP_LIBS)
+
+AM_CFLAGS = \
+	    $(LIBGSSDP_CFLAGS) \
+	    -I $(top_srcdir) \
+	    -DDATA_PATH="\"$(srcdir)\""
 
-CLEANFILES = $(BUILT_SOURCES)
-DISTCLEANFILES = $(BUILT_SOURCES)
-MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)
diff --git a/tests/gtest/Makefile.am b/tests/gtest/Makefile.am
deleted file mode 100644
index 722f058..0000000
--- a/tests/gtest/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-TESTS_ENVIRONMENT = G_SLICE=debug-blocks \
-		    LD_LIBRARY_PATH=$(top_builddir)/libgssdp/.libs:$(LD_LIBRARY_PATH)
-
-TESTS=$(check_PROGRAMS)
-
-check_PROGRAMS = test-regression test-functional
-
-noinst_LIBRARIES = libtestutil.a
-
-libtestutil_a_SOURCES = test-util.h test-util.c
-
-test_regression_SOURCES = test-regression.c
-test_functional_SOURCES = test-functional.c
-
-LDADD = \
-	$(top_builddir)/libgssdp/libgssdp-1.0.la \
-	libtestutil.a \
-	$(LIBGSSDP_LIBS)
-
-AM_CFLAGS = \
-	    $(LIBGSSDP_CFLAGS) \
-	    -I $(top_srcdir) \
-	    -DDATA_PATH="\"$(srcdir)\""
-
diff --git a/tests/gtest/test-functional.c b/tests/test-functional.c
index c9b9fc0..c9b9fc0 100644
--- a/tests/gtest/test-functional.c
+++ b/tests/test-functional.c
diff --git a/tests/gtest/test-regression.c b/tests/test-regression.c
index dc5a802..dc5a802 100644
--- a/tests/gtest/test-regression.c
+++ b/tests/test-regression.c
diff --git a/tests/gtest/test-util.c b/tests/test-util.c
index 5bebefc..5bebefc 100644
--- a/tests/gtest/test-util.c
+++ b/tests/test-util.c
diff --git a/tests/gtest/test-util.h b/tests/test-util.h
index 3175bd6..3175bd6 100644
--- a/tests/gtest/test-util.h
+++ b/tests/test-util.h