[gegl] tests: ff-load-save tests - migrate to common test setup - run directly within meson test framework
- From: Øyvind "pippin" Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] tests: ff-load-save tests - migrate to common test setup - run directly within meson test framework
- Date: Sat, 20 Feb 2021 22:28:48 +0000 (UTC)
commit 1b7b17e346b9d7b03f4577b630c0bb8d14654a25
Author: John Marshall <jtm home gmail com>
Date: Thu Jun 18 08:17:42 2020 +0100
tests: ff-load-save tests
- migrate to common test setup
- run directly within meson test framework
examples/meson.build | 4 +-
tests/ff-load-save/meson.build | 63 ++++++++++++++++++++++++++++----
tests/ff-load-save/tests_ff_load_save.sh | 6 +--
tests/meson.build | 4 +-
4 files changed, 63 insertions(+), 14 deletions(-)
---
diff --git a/examples/meson.build b/examples/meson.build
index d3ac1f0ac..4b505deea 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -44,9 +44,9 @@ foreach example : examples
# Fore use as tests for ff-load-save
if example_name == 'gegl-video'
- gegl_video_example = exe
+ gegl_video = exe
endif
if example_name == 'frame-counter'
- frame_counter_example = exe
+ frame_counter = exe
endif
endforeach
diff --git a/tests/ff-load-save/meson.build b/tests/ff-load-save/meson.build
index 980a621e9..3183a9465 100644
--- a/tests/ff-load-save/meson.build
+++ b/tests/ff-load-save/meson.build
@@ -1,13 +1,60 @@
-if avlibs_found and gexiv2.found()
- test('ff-load-save',
- find_program('tests_ff_load_save.sh'),
- env: [ 'MESON_BUILD_ROOT=' + meson.build_root() ],
+ff_video_tests = {
+ 'mpeg4-128kb.avi': [
+ '--video-codec mpeg4',
+ '--video-bit-rate', '128',
+ ],
+ 'mpeg4-512kb.avi': [
+ '--video-codec mpeg4',
+ '--video-bit-rate', '512',
+ ],
+ '512kb.mp4': [
+ '--video-codec mpeg4',
+ '--video-bit-rate', '512',
+ ],
+ '128kb.mp4': [
+ '--video-codec mpeg4',
+ '--video-bit-rate', '128',
+ ],
+ '128kb-12fps.mp4': [
+ '--video-codec mpeg4',
+ '--video-bit-rate', '128',
+ '--fps', '12',
+ ],
+ '128kb-100fps.mp4': [
+ '--video-codec mpeg4',
+ '--video-bit-rate', '128',
+ '--fps', '100',
+ ],
+ '512kb-28fps.ogv': [
+ '--video-bit-rate', '128',
+ '--fps', '28',
+ ],
+}
+
+foreach _test, _args : ff_video_tests
+ test(_test.underscorify(),
+ frame_counter,
+ args: [
+ _args,
+ _test,
+ ],
+ env: gegl_test_env,
workdir: meson.current_build_dir(),
suite: 'ff-load-save',
- protocol: 'tap',
- timeout: 360,
is_parallel: false,
)
-
-endif
+ test(_test.underscorify(),
+ gegl_video,
+ args: [
+ _test,
+ '-s', '74',
+ '-e', '74',
+ '-of', '@0@-'.format(_test)
+ ],
+ env: gegl_test_env,
+ workdir: meson.current_build_dir(),
+ suite: 'ff-load-save',
+ is_parallel: false,
+ )
+endforeach
diff --git a/tests/ff-load-save/tests_ff_load_save.sh b/tests/ff-load-save/tests_ff_load_save.sh
index 64efea912..36ce6a206 100755
--- a/tests/ff-load-save/tests_ff_load_save.sh
+++ b/tests/ff-load-save/tests_ff_load_save.sh
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
-export GEGL_PATH="${MESON_BUILD_ROOT}/operations"
+export GEGL_PATH="${ABS_TOP_BUILDDIR}/operations"
-FrameCounter="${MESON_BUILD_ROOT}/examples/frame-counter"
-GeglVideo="${MESON_BUILD_ROOT}/examples/gegl-video"
+FrameCounter="${ABS_TOP_BUILDDIR}/examples/frame-counter"
+GeglVideo="${ABS_TOP_BUILDDIR}/examples/gegl-video"
testcount=0
diff --git a/tests/meson.build b/tests/meson.build
index d110416fb..e515ab060 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -42,6 +42,8 @@ if pygobject3.found()
subdir('python')
endif
subdir('xml')
-subdir('ff-load-save')
+if avlibs_found and gexiv2.found()
+ subdir('ff-load-save')
+endif
subdir('compositions')
subdir('buffer')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]