From 23cadbae94bfa332ca5a826e4526a50a5c1d1fbc Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 12 Aug 2010 10:49:59 +0300 Subject: [PATCH] playback: move tests from plugin-dir to tests/examples/playback --- configure.ac | 9 +++--- gst/playback/.gitignore | 9 +----- gst/playback/Makefile.am | 28 ------------------- tests/examples/Makefile.am | 4 +-- tests/examples/playback/.gitignore | 8 ++++++ tests/examples/playback/Makefile.am | 26 +++++++++++++++++ {gst => tests/examples}/playback/decodetest.c | 0 {gst => tests/examples}/playback/test.c | 0 {gst => tests/examples}/playback/test2.c | 0 {gst => tests/examples}/playback/test3.c | 0 {gst => tests/examples}/playback/test4.c | 0 {gst => tests/examples}/playback/test5.c | 0 {gst => tests/examples}/playback/test6.c | 0 {gst => tests/examples}/playback/test7.c | 0 14 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 tests/examples/playback/.gitignore create mode 100644 tests/examples/playback/Makefile.am rename {gst => tests/examples}/playback/decodetest.c (100%) rename {gst => tests/examples}/playback/test.c (100%) rename {gst => tests/examples}/playback/test2.c (100%) rename {gst => tests/examples}/playback/test3.c (100%) rename {gst => tests/examples}/playback/test4.c (100%) rename {gst => tests/examples}/playback/test5.c (100%) rename {gst => tests/examples}/playback/test6.c (100%) rename {gst => tests/examples}/playback/test7.c (100%) diff --git a/configure.ac b/configure.ac index 38141a6485..2cc5cf1cb6 100644 --- 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/overlay/Makefile -tests/examples/seek/Makefile -tests/examples/volume/Makefile -tests/examples/snapshot/Makefile tests/examples/gio/Makefile +tests/examples/overlay/Makefile +tests/examples/playback/Makefile +tests/examples/seek/Makefile +tests/examples/snapshot/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 a81827a250..091c64d394 100644 --- 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 2ba595260e..e45ef0f569 100644 --- 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 de197609ec..5ec1e0ac90 100644 --- 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 index 0000000000..4fdb026376 --- /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 index 0000000000..b1d7f945d2 --- /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