summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorU. Artie Eoff <ullysses.a.eoff@intel.com>2019-10-08 12:19:06 -0700
committerU. Artie Eoff <ullysses.a.eoff@intel.com>2019-10-16 12:48:24 -0700
commit97aabe8784c057a4bee33d6f541ab7d75ca3708e (patch)
treeba1cf34ee77bd61bc9bf8844379302fb0d609ebe
parent8af5ef8a0be0e5a6d97b6f8e9c942331d065e30a (diff)
tests: move examples and tests to subfolders
This makes way for adding unit (check) tests.
-rw-r--r--meson.build4
-rw-r--r--tests/examples/meson.build (renamed from tests/elements/meson.build)0
-rw-r--r--tests/examples/test-roi.c (renamed from tests/elements/test-roi.c)0
-rw-r--r--tests/examples/test-vaapicontext.c (renamed from tests/elements/test-vaapicontext.c)0
-rw-r--r--tests/examples/test-vaapipostproc.c (renamed from tests/elements/test-vaapipostproc.c)0
-rw-r--r--tests/examples/test-vaapisink.c (renamed from tests/elements/test-vaapisink.c)0
-rw-r--r--tests/internal/codec.c (renamed from tests/codec.c)0
-rw-r--r--tests/internal/codec.h (renamed from tests/codec.h)0
-rw-r--r--tests/internal/decoder.c (renamed from tests/decoder.c)0
-rw-r--r--tests/internal/decoder.h (renamed from tests/decoder.h)0
-rw-r--r--tests/internal/image.c (renamed from tests/image.c)0
-rw-r--r--tests/internal/image.h (renamed from tests/image.h)0
-rw-r--r--tests/internal/meson.build81
-rw-r--r--tests/internal/output.c (renamed from tests/output.c)0
-rw-r--r--tests/internal/output.h (renamed from tests/output.h)0
-rw-r--r--tests/internal/simple-decoder.c (renamed from tests/simple-decoder.c)0
-rw-r--r--tests/internal/simple-encoder.c (renamed from tests/simple-encoder.c)0
-rw-r--r--tests/internal/test-decode.c (renamed from tests/test-decode.c)0
-rw-r--r--tests/internal/test-decode.h (renamed from tests/test-decode.h)0
-rw-r--r--tests/internal/test-display.c (renamed from tests/test-display.c)0
-rw-r--r--tests/internal/test-fei-enc-in.c (renamed from tests/test-fei-enc-in.c)0
-rw-r--r--tests/internal/test-fei-enc-out.c (renamed from tests/test-fei-enc-out.c)0
-rw-r--r--tests/internal/test-filter.c (renamed from tests/test-filter.c)0
-rw-r--r--tests/internal/test-h264.c (renamed from tests/test-h264.c)0
-rw-r--r--tests/internal/test-h264.h (renamed from tests/test-h264.h)0
-rw-r--r--tests/internal/test-jpeg.c (renamed from tests/test-jpeg.c)0
-rw-r--r--tests/internal/test-jpeg.h (renamed from tests/test-jpeg.h)0
-rw-r--r--tests/internal/test-mpeg2.c (renamed from tests/test-mpeg2.c)0
-rw-r--r--tests/internal/test-mpeg2.h (renamed from tests/test-mpeg2.h)0
-rw-r--r--tests/internal/test-mpeg4.c (renamed from tests/test-mpeg4.c)0
-rw-r--r--tests/internal/test-mpeg4.h (renamed from tests/test-mpeg4.h)0
-rw-r--r--tests/internal/test-subpicture-data.c (renamed from tests/test-subpicture-data.c)0
-rw-r--r--tests/internal/test-subpicture-data.h (renamed from tests/test-subpicture-data.h)0
-rw-r--r--tests/internal/test-subpicture.c (renamed from tests/test-subpicture.c)0
-rw-r--r--tests/internal/test-surfaces.c (renamed from tests/test-surfaces.c)0
-rw-r--r--tests/internal/test-textures.c (renamed from tests/test-textures.c)0
-rw-r--r--tests/internal/test-vc1.c (renamed from tests/test-vc1.c)0
-rw-r--r--tests/internal/test-vc1.h (renamed from tests/test-vc1.h)0
-rw-r--r--tests/internal/test-windows.c (renamed from tests/test-windows.c)0
-rw-r--r--tests/internal/y4mreader.c (renamed from tests/y4mreader.c)0
-rw-r--r--tests/internal/y4mreader.h (renamed from tests/y4mreader.h)0
-rw-r--r--tests/meson.build85
42 files changed, 85 insertions, 85 deletions
diff --git a/meson.build b/meson.build
index 4ef68813..827dc275 100644
--- a/meson.build
+++ b/meson.build
@@ -164,9 +164,7 @@ libsinc = include_directories('gst-libs')
subdir('gst-libs')
subdir('gst')
-if not get_option('examples').disabled()
- subdir('tests')
-endif
+subdir('tests')
subdir('docs')
python3 = import('python').find_installation()
diff --git a/tests/elements/meson.build b/tests/examples/meson.build
index 0a61f7d0..0a61f7d0 100644
--- a/tests/elements/meson.build
+++ b/tests/examples/meson.build
diff --git a/tests/elements/test-roi.c b/tests/examples/test-roi.c
index 2ce614ef..2ce614ef 100644
--- a/tests/elements/test-roi.c
+++ b/tests/examples/test-roi.c
diff --git a/tests/elements/test-vaapicontext.c b/tests/examples/test-vaapicontext.c
index 0085ca96..0085ca96 100644
--- a/tests/elements/test-vaapicontext.c
+++ b/tests/examples/test-vaapicontext.c
diff --git a/tests/elements/test-vaapipostproc.c b/tests/examples/test-vaapipostproc.c
index 87d13539..87d13539 100644
--- a/tests/elements/test-vaapipostproc.c
+++ b/tests/examples/test-vaapipostproc.c
diff --git a/tests/elements/test-vaapisink.c b/tests/examples/test-vaapisink.c
index 41f3fc3e..41f3fc3e 100644
--- a/tests/elements/test-vaapisink.c
+++ b/tests/examples/test-vaapisink.c
diff --git a/tests/codec.c b/tests/internal/codec.c
index d14981ac..d14981ac 100644
--- a/tests/codec.c
+++ b/tests/internal/codec.c
diff --git a/tests/codec.h b/tests/internal/codec.h
index 6aaf5b8f..6aaf5b8f 100644
--- a/tests/codec.h
+++ b/tests/internal/codec.h
diff --git a/tests/decoder.c b/tests/internal/decoder.c
index 1dfbba26..1dfbba26 100644
--- a/tests/decoder.c
+++ b/tests/internal/decoder.c
diff --git a/tests/decoder.h b/tests/internal/decoder.h
index 68530009..68530009 100644
--- a/tests/decoder.h
+++ b/tests/internal/decoder.h
diff --git a/tests/image.c b/tests/internal/image.c
index 13044710..13044710 100644
--- a/tests/image.c
+++ b/tests/internal/image.c
diff --git a/tests/image.h b/tests/internal/image.h
index 6abbdb05..6abbdb05 100644
--- a/tests/image.h
+++ b/tests/internal/image.h
diff --git a/tests/internal/meson.build b/tests/internal/meson.build
new file mode 100644
index 00000000..a118d384
--- /dev/null
+++ b/tests/internal/meson.build
@@ -0,0 +1,81 @@
+libdecutils_sources = [
+ 'decoder.c',
+ 'test-h264.c',
+ 'test-jpeg.c',
+ 'test-mpeg2.c',
+ 'test-mpeg4.c',
+ 'test-vc1.c',
+]
+
+libdecutils_headers = [
+ 'decoder.h',
+ 'test-h264.h',
+ 'test-jpeg.h',
+ 'test-mpeg2.h',
+ 'test-mpeg4.h',
+ 'test-vc1.h',
+]
+
+libutils_sources = [
+ 'codec.c',
+ 'image.c',
+ 'output.c',
+ 'test-subpicture-data.c',
+ 'y4mreader.c',
+]
+
+libutils_headers = [
+ 'codec.h',
+ 'image.h',
+ 'output.h',
+ 'test-subpicture-data.h',
+ 'y4mreader.h',
+]
+
+test_examples = [
+ 'simple-decoder',
+ 'test-decode',
+ 'test-display',
+ 'test-filter',
+ 'test-surfaces',
+ 'test-windows',
+ 'test-subpicture',
+]
+
+if USE_ENCODERS
+ test_examples += [ 'simple-encoder' ]
+endif
+
+if USE_H264_FEI_ENCODER
+ test_examples += [
+ 'test-fei-enc-out',
+ 'test-fei-enc-in',
+ ]
+endif
+
+if USE_GLX
+ test_examples += [ 'test-textures' ]
+endif
+
+libutils = static_library('libutils',
+ libutils_sources + libutils_headers,
+ c_args : gstreamer_vaapi_args,
+ include_directories: [configinc, libsinc],
+ dependencies : gstlibvaapi_deps,
+ install: false)
+
+libdecutils = static_library('libdecutils',
+ libdecutils_sources + libdecutils_headers,
+ c_args : gstreamer_vaapi_args,
+ include_directories: [configinc, libsinc],
+ dependencies : gstlibvaapi_deps,
+ install: false)
+
+foreach example : test_examples
+ executable(example, '@0@.c'.format(example),
+ c_args : gstreamer_vaapi_args,
+ include_directories: [configinc, libsinc],
+ dependencies : [gst_dep, libva_dep, gstlibvaapi_dep],
+ link_with: [libutils, libdecutils],
+ install: false)
+endforeach
diff --git a/tests/output.c b/tests/internal/output.c
index b100f032..b100f032 100644
--- a/tests/output.c
+++ b/tests/internal/output.c
diff --git a/tests/output.h b/tests/internal/output.h
index 7d109f24..7d109f24 100644
--- a/tests/output.h
+++ b/tests/internal/output.h
diff --git a/tests/simple-decoder.c b/tests/internal/simple-decoder.c
index 34f17d5b..34f17d5b 100644
--- a/tests/simple-decoder.c
+++ b/tests/internal/simple-decoder.c
diff --git a/tests/simple-encoder.c b/tests/internal/simple-encoder.c
index 97857731..97857731 100644
--- a/tests/simple-encoder.c
+++ b/tests/internal/simple-encoder.c
diff --git a/tests/test-decode.c b/tests/internal/test-decode.c
index ef16aa15..ef16aa15 100644
--- a/tests/test-decode.c
+++ b/tests/internal/test-decode.c
diff --git a/tests/test-decode.h b/tests/internal/test-decode.h
index fbe46a6d..fbe46a6d 100644
--- a/tests/test-decode.h
+++ b/tests/internal/test-decode.h
diff --git a/tests/test-display.c b/tests/internal/test-display.c
index 068c155a..068c155a 100644
--- a/tests/test-display.c
+++ b/tests/internal/test-display.c
diff --git a/tests/test-fei-enc-in.c b/tests/internal/test-fei-enc-in.c
index 9f79c166..9f79c166 100644
--- a/tests/test-fei-enc-in.c
+++ b/tests/internal/test-fei-enc-in.c
diff --git a/tests/test-fei-enc-out.c b/tests/internal/test-fei-enc-out.c
index 32326434..32326434 100644
--- a/tests/test-fei-enc-out.c
+++ b/tests/internal/test-fei-enc-out.c
diff --git a/tests/test-filter.c b/tests/internal/test-filter.c
index ab57775a..ab57775a 100644
--- a/tests/test-filter.c
+++ b/tests/internal/test-filter.c
diff --git a/tests/test-h264.c b/tests/internal/test-h264.c
index d94dc42c..d94dc42c 100644
--- a/tests/test-h264.c
+++ b/tests/internal/test-h264.c
diff --git a/tests/test-h264.h b/tests/internal/test-h264.h
index d94df4e5..d94df4e5 100644
--- a/tests/test-h264.h
+++ b/tests/internal/test-h264.h
diff --git a/tests/test-jpeg.c b/tests/internal/test-jpeg.c
index f3bd4a14..f3bd4a14 100644
--- a/tests/test-jpeg.c
+++ b/tests/internal/test-jpeg.c
diff --git a/tests/test-jpeg.h b/tests/internal/test-jpeg.h
index 9fa3ed1b..9fa3ed1b 100644
--- a/tests/test-jpeg.h
+++ b/tests/internal/test-jpeg.h
diff --git a/tests/test-mpeg2.c b/tests/internal/test-mpeg2.c
index 16e69b73..16e69b73 100644
--- a/tests/test-mpeg2.c
+++ b/tests/internal/test-mpeg2.c
diff --git a/tests/test-mpeg2.h b/tests/internal/test-mpeg2.h
index ba21d0f6..ba21d0f6 100644
--- a/tests/test-mpeg2.h
+++ b/tests/internal/test-mpeg2.h
diff --git a/tests/test-mpeg4.c b/tests/internal/test-mpeg4.c
index 270359b4..270359b4 100644
--- a/tests/test-mpeg4.c
+++ b/tests/internal/test-mpeg4.c
diff --git a/tests/test-mpeg4.h b/tests/internal/test-mpeg4.h
index aaa613dd..aaa613dd 100644
--- a/tests/test-mpeg4.h
+++ b/tests/internal/test-mpeg4.h
diff --git a/tests/test-subpicture-data.c b/tests/internal/test-subpicture-data.c
index 0bd21339..0bd21339 100644
--- a/tests/test-subpicture-data.c
+++ b/tests/internal/test-subpicture-data.c
diff --git a/tests/test-subpicture-data.h b/tests/internal/test-subpicture-data.h
index cc37988a..cc37988a 100644
--- a/tests/test-subpicture-data.h
+++ b/tests/internal/test-subpicture-data.h
diff --git a/tests/test-subpicture.c b/tests/internal/test-subpicture.c
index 804f0a9e..804f0a9e 100644
--- a/tests/test-subpicture.c
+++ b/tests/internal/test-subpicture.c
diff --git a/tests/test-surfaces.c b/tests/internal/test-surfaces.c
index 2f9a90fa..2f9a90fa 100644
--- a/tests/test-surfaces.c
+++ b/tests/internal/test-surfaces.c
diff --git a/tests/test-textures.c b/tests/internal/test-textures.c
index 46e2b916..46e2b916 100644
--- a/tests/test-textures.c
+++ b/tests/internal/test-textures.c
diff --git a/tests/test-vc1.c b/tests/internal/test-vc1.c
index 4a8dc9e8..4a8dc9e8 100644
--- a/tests/test-vc1.c
+++ b/tests/internal/test-vc1.c
diff --git a/tests/test-vc1.h b/tests/internal/test-vc1.h
index 3b948640..3b948640 100644
--- a/tests/test-vc1.h
+++ b/tests/internal/test-vc1.h
diff --git a/tests/test-windows.c b/tests/internal/test-windows.c
index 4985e350..4985e350 100644
--- a/tests/test-windows.c
+++ b/tests/internal/test-windows.c
diff --git a/tests/y4mreader.c b/tests/internal/y4mreader.c
index 76847bb2..76847bb2 100644
--- a/tests/y4mreader.c
+++ b/tests/internal/y4mreader.c
diff --git a/tests/y4mreader.h b/tests/internal/y4mreader.h
index 369efb6f..369efb6f 100644
--- a/tests/y4mreader.h
+++ b/tests/internal/y4mreader.h
diff --git a/tests/meson.build b/tests/meson.build
index 2bc2410e..b27c0dab 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,83 +1,4 @@
-libdecutils_sources = [
- 'decoder.c',
- 'test-h264.c',
- 'test-jpeg.c',
- 'test-mpeg2.c',
- 'test-mpeg4.c',
- 'test-vc1.c',
-]
-
-libdecutils_headers = [
- 'decoder.h',
- 'test-h264.h',
- 'test-jpeg.h',
- 'test-mpeg2.h',
- 'test-mpeg4.h',
- 'test-vc1.h',
-]
-
-libutils_sources = [
- 'codec.c',
- 'image.c',
- 'output.c',
- 'test-subpicture-data.c',
- 'y4mreader.c',
-]
-
-libutils_headers = [
- 'codec.h',
- 'image.h',
- 'output.h',
- 'test-subpicture-data.h',
- 'y4mreader.h',
-]
-
-test_examples = [
- 'simple-decoder',
- 'test-decode',
- 'test-display',
- 'test-filter',
- 'test-surfaces',
- 'test-windows',
- 'test-subpicture',
-]
-
-if USE_ENCODERS
- test_examples += [ 'simple-encoder' ]
+if not get_option('examples').disabled()
+ subdir('examples')
+ subdir('internal')
endif
-
-if USE_H264_FEI_ENCODER
- test_examples += [
- 'test-fei-enc-out',
- 'test-fei-enc-in',
- ]
-endif
-
-if USE_GLX
- test_examples += [ 'test-textures' ]
-endif
-
-libutils = static_library('libutils',
- libutils_sources + libutils_headers,
- c_args : gstreamer_vaapi_args,
- include_directories: [configinc, libsinc],
- dependencies : gstlibvaapi_deps,
- install: false)
-
-libdecutils = static_library('libdecutils',
- libdecutils_sources + libdecutils_headers,
- c_args : gstreamer_vaapi_args,
- include_directories: [configinc, libsinc],
- dependencies : gstlibvaapi_deps,
- install: false)
-
-foreach example : test_examples
- executable(example, '@0@.c'.format(example),
- c_args : gstreamer_vaapi_args,
- include_directories: [configinc, libsinc],
- dependencies : [gst_dep, libva_dep, gstlibvaapi_dep],
- link_with: [libutils, libdecutils],
- install: false)
-endforeach
-
-subdir('elements')