playback: move tests from plugin-dir to tests/examples/playback

diff --git a/configure.ac b/configure.ac
index 38141a6..2cc5cf1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -951,11 +951,12 @@ tests/check/Makefile
 tests/examples/Makefile
 tests/examples/app/Makefile
 tests/examples/dynamic/Makefile
+tests/examples/gio/Makefile
 tests/examples/overlay/Makefile
+tests/examples/playback/Makefile
 tests/examples/seek/Makefile
-tests/examples/volume/Makefile
 tests/examples/snapshot/Makefile
-tests/examples/gio/Makefile
+tests/examples/volume/Makefile
 tests/examples/v4l/Makefile
 tests/files/Makefile
 tests/icles/Makefile

diff --git a/gst/playback/.gitignore b/gst/playback/.gitignore
index a81827a..091c64d 100644 (file)
--- a/gst/playback/.gitignore
+++ b/gst/playback/.gitignore
@@ -1,10 +1,3 @@
-decodetest
-test
-test2
-test3
-test4
-test5
 gstplay-marshal.c
 gstplay-marshal.h
-test6
-test7
+

diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am
index 2ba5952..e45ef0f 100644 (file)
--- a/gst/playback/Makefile.am
+++ b/gst/playback/Makefile.am
@@ -67,34 +67,6 @@ noinst_HEADERS = \
        gstsubtitleoverlay.h \
        gststreamsynchronizer.h
 
-noinst_PROGRAMS = test decodetest test2 test3 test4 test5 test6 test7
-
-test_LDADD = $(GST_LIBS) 
-test_CFLAGS = $(GST_CFLAGS)
-
-test2_LDADD = $(GST_LIBS) 
-test2_CFLAGS = $(GST_CFLAGS)
-
-test3_LDADD = $(GST_LIBS) 
-test3_CFLAGS = $(GST_CFLAGS)
-
-test4_LDADD = $(GST_LIBS) 
-test4_CFLAGS = $(GST_CFLAGS)
-
-test5_LDADD = $(GST_LIBS) 
-test5_CFLAGS = $(GST_CFLAGS)
-
-test6_LDADD = $(GST_LIBS) 
-test6_CFLAGS = $(GST_CFLAGS)
-
-test7_LDADD = $(GST_LIBS) 
-test7_CFLAGS = $(GST_CFLAGS)
-
-decodetest_LDADD = $(GST_LIBS) 
-decodetest_CFLAGS = $(GST_CFLAGS)
-
-BUILT_SOURCES = $(built_headers) $(built_sources)
-
 EXTRA_DIST = gstplay-marshal.list
 
 CLEANFILES = $(BUILT_SOURCES)

diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am
index de19760..5ec1e0a 100644 (file)
--- a/tests/examples/Makefile.am
+++ b/tests/examples/Makefile.am
@@ -8,8 +8,8 @@ if USE_GIO
 GIO_SUBDIRS = gio
 endif
 
-SUBDIRS = app $(FT2_SUBDIRS) $(GIO_SUBDIRS) volume dynamic v4l overlay
+SUBDIRS = app  dynamic $(FT2_SUBDIRS) $(GIO_SUBDIRS) overlay playback volume v4l
 
-DIST_SUBDIRS = app seek volume dynamic snapshot gio v4l overlay
+DIST_SUBDIRS = app dynamic gio overlay playback seek snapshot volume v4l
 
 include $(top_srcdir)/common/parallel-subdirs.mak

diff --git a/tests/examples/playback/.gitignore b/tests/examples/playback/.gitignore
new file mode 100644 (file)
index 0000000..4fdb026
--- /dev/null
+++ b/tests/examples/playback/.gitignore
@@ -0,0 +1,8 @@
+decodetest
+test
+test2
+test3
+test4
+test5
+test6
+test7

diff --git a/tests/examples/playback/Makefile.am b/tests/examples/playback/Makefile.am
new file mode 100644 (file)
index 0000000..b1d7f94
--- /dev/null
+++ b/tests/examples/playback/Makefile.am
@@ -0,0 +1,26 @@
+noinst_PROGRAMS = test decodetest test2 test3 test4 test5 test6 test7
+
+test_LDADD = $(GST_LIBS) 
+test_CFLAGS = $(GST_CFLAGS)
+
+test2_LDADD = $(GST_LIBS) 
+test2_CFLAGS = $(GST_CFLAGS)
+
+test3_LDADD = $(GST_LIBS) 
+test3_CFLAGS = $(GST_CFLAGS)
+
+test4_LDADD = $(GST_LIBS) 
+test4_CFLAGS = $(GST_CFLAGS)
+
+test5_LDADD = $(GST_LIBS) 
+test5_CFLAGS = $(GST_CFLAGS)
+
+test6_LDADD = $(GST_LIBS) 
+test6_CFLAGS = $(GST_CFLAGS)
+
+test7_LDADD = $(GST_LIBS) 
+test7_CFLAGS = $(GST_CFLAGS)
+
+decodetest_LDADD = $(GST_LIBS) 
+decodetest_CFLAGS = $(GST_CFLAGS)
+

diff --git a/gst/playback/decodetest.c b/tests/examples/playback/decodetest.c
similarity index 100%
rename from gst/playback/decodetest.c
rename to tests/examples/playback/decodetest.c

diff --git a/gst/playback/test.c b/tests/examples/playback/test.c
similarity index 100%
rename from gst/playback/test.c
rename to tests/examples/playback/test.c

diff --git a/gst/playback/test2.c b/tests/examples/playback/test2.c
similarity index 100%
rename from gst/playback/test2.c
rename to tests/examples/playback/test2.c

diff --git a/gst/playback/test3.c b/tests/examples/playback/test3.c
similarity index 100%
rename from gst/playback/test3.c
rename to tests/examples/playback/test3.c

diff --git a/gst/playback/test4.c b/tests/examples/playback/test4.c
similarity index 100%
rename from gst/playback/test4.c
rename to tests/examples/playback/test4.c

diff --git a/gst/playback/test5.c b/tests/examples/playback/test5.c
similarity index 100%
rename from gst/playback/test5.c
rename to tests/examples/playback/test5.c

diff --git a/gst/playback/test6.c b/tests/examples/playback/test6.c
similarity index 100%
rename from gst/playback/test6.c
rename to tests/examples/playback/test6.c

diff --git a/gst/playback/test7.c b/tests/examples/playback/test7.c
similarity index 100%
rename from gst/playback/test7.c
rename to tests/examples/playback/test7.c