summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorgb <gb@5584edef-b1fe-4b99-b61b-dd2bab72e969>2010-03-16 08:49:16 +0000
committergb <gb@5584edef-b1fe-4b99-b61b-dd2bab72e969>2010-03-16 08:49:16 +0000
commit148d104c1ab634d634a2131d3d1c33357dd1a795 (patch)
tree0373b3d18103928cbfc1faf3a01db0f62b795ab5 /tests
parent69d58a0857f1a4c3483cf91224185199290d82ef (diff)
downloadgst-vaapi-148d104c1ab634d634a2131d3d1c33357dd1a795.tar.gz
Move tests to top-level tests/ directory.
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am27
-rw-r--r--tests/examples/Makefile.am4
-rw-r--r--tests/examples/generic/Makefile.am29
-rw-r--r--tests/test-display.c (renamed from tests/examples/generic/test-display.c)0
-rw-r--r--tests/test-surfaces.c (renamed from tests/examples/generic/test-surfaces.c)0
-rw-r--r--tests/test-windows.c (renamed from tests/examples/generic/test-windows.c)0
6 files changed, 26 insertions, 34 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cbf577e6..cc7cdcf6 100644
--- 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
index f09ad590..00000000
--- 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
index cc7cdcf6..00000000
--- 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
index 4a510d53..4a510d53 100644
--- a/tests/examples/generic/test-display.c
+++ b/tests/test-display.c
diff --git a/tests/examples/generic/test-surfaces.c b/tests/test-surfaces.c
index d201bdbd..d201bdbd 100644
--- a/tests/examples/generic/test-surfaces.c
+++ b/tests/test-surfaces.c
diff --git a/tests/examples/generic/test-windows.c b/tests/test-windows.c
index 07db884d..07db884d 100644
--- a/tests/examples/generic/test-windows.c
+++ b/tests/test-windows.c