Move tests to top-level tests/ directory.

diff --git a/configure.ac b/configure.ac
index 7ada779..35f39f9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -152,6 +152,4 @@ AC_OUTPUT([
     sys/vaapiconvert/Makefile
     sys/vaapisink/Makefile
     tests/Makefile
-    tests/examples/Makefile
-    tests/examples/generic/Makefile
 ])

diff --git a/tests/Makefile.am b/tests/Makefile.am
index cbf577e..cc7cdcf 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,29 @@
-SUBDIRS = examples
+noinst_PROGRAMS =      \
+       test-display    \
+       test-surfaces   \
+       test-windows    \
+       $(NULL)
+
+TEST_CFLAGS = \
+       $(GST_CFLAGS) \
+       -I$(top_srcdir)/gst-libs \
+       $(X11_CFLAGS)
+
+TEST_LIBS = \
+       $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-@GST_MAJORMINOR@.la \
+       $(X11_LIBS)
+
+test_display_SOURCES   = test-display.c
+test_display_CFLAGS    = $(TEST_CFLAGS)
+test_display_LDADD     = $(TEST_LIBS)
+
+test_surfaces_SOURCES  = test-surfaces.c
+test_surfaces_CFLAGS   = $(TEST_CFLAGS)
+test_surfaces_LDADD    = $(TEST_LIBS)
+
+test_windows_SOURCES   = test-windows.c
+test_windows_CFLAGS    = $(TEST_CFLAGS)
+test_windows_LDADD     = $(TEST_LIBS)
 
 # Extra clean files so that maintainer-clean removes *everything*
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am
deleted file mode 100644 (file)
index f09ad59..0000000
--- a/tests/examples/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = generic
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in

diff --git a/tests/examples/generic/Makefile.am b/tests/examples/generic/Makefile.am
deleted file mode 100644 (file)
index cc7cdcf..0000000
--- a/tests/examples/generic/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-noinst_PROGRAMS =      \
-       test-display    \
-       test-surfaces   \
-       test-windows    \
-       $(NULL)
-
-TEST_CFLAGS = \
-       $(GST_CFLAGS) \
-       -I$(top_srcdir)/gst-libs \
-       $(X11_CFLAGS)
-
-TEST_LIBS = \
-       $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-@GST_MAJORMINOR@.la \
-       $(X11_LIBS)
-
-test_display_SOURCES   = test-display.c
-test_display_CFLAGS    = $(TEST_CFLAGS)
-test_display_LDADD     = $(TEST_LIBS)
-
-test_surfaces_SOURCES  = test-surfaces.c
-test_surfaces_CFLAGS   = $(TEST_CFLAGS)
-test_surfaces_LDADD    = $(TEST_LIBS)
-
-test_windows_SOURCES   = test-windows.c
-test_windows_CFLAGS    = $(TEST_CFLAGS)
-test_windows_LDADD     = $(TEST_LIBS)
-
-# Extra clean files so that maintainer-clean removes *everything*
-MAINTAINERCLEANFILES = Makefile.in

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

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

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