summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeungha Yang <seungha.yang@navercorp.com>2019-07-15 22:38:35 +0900
committerSeungha Yang <seungha.yang@navercorp.com>2019-07-15 22:46:18 +0900
commitfe92e92c14fa38d81a4a239536eedf547dd011d2 (patch)
treeebadbae7bc309c176730026d07952adccbf0772c
parent985ace70e05f664d13e268cf0fb135d19b29fff8 (diff)
tests: x264enc: Enable test on Windows
... with removal of pointless unistd.h dependency. Note that full dependency listing is required to run unit test executable binary on Windows uninstalled environment.
-rw-r--r--tests/check/elements/x264enc.c2
-rw-r--r--tests/check/meson.build5
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/check/elements/x264enc.c b/tests/check/elements/x264enc.c
index 6c64d506..9490f688 100644
--- a/tests/check/elements/x264enc.c
+++ b/tests/check/elements/x264enc.c
@@ -20,8 +20,6 @@
* Boston, MA 02110-1301, USA.
*/
-#include <unistd.h>
-
#include <gst/check/gstcheck.h>
/* For ease of programming we use globals to keep refs for our floating
diff --git a/tests/check/meson.build b/tests/check/meson.build
index f07dca0b..306791d5 100644
--- a/tests/check/meson.build
+++ b/tests/check/meson.build
@@ -1,5 +1,6 @@
# name, condition when to skip the test and extra dependencies
ugly_tests = [
+ [ 'elements/x264enc', not x264_dep.found(), [ x264_dep, gmodule_dep ] ],
[ 'elements/xingmux' ],
[ 'generic/states' ],
]
@@ -9,7 +10,6 @@ if host_machine.system() != 'windows'
ugly_tests += [
[ 'elements/amrnbenc', not amrnb_dep.found() ],
[ 'elements/mpeg2dec', not mpeg2_dep.found() or not cdata.has('HAVE_UNISTD_H'), [ gstvideo_dep ] ],
- [ 'elements/x264enc', not x264_dep.found() or not cdata.has('HAVE_UNISTD_H') ],
]
endif
@@ -28,7 +28,8 @@ if gst_dep.type_name() == 'pkgconfig'
pbase.get_pkgconfig_variable('pluginsdir')]
endif
-test_deps = [gst_dep, gstbase_dep, gstcheck_dep, gstaudio_dep, gstapp_dep, gstfft_dep]
+test_deps = [gst_dep, gstbase_dep, gstcheck_dep, gstaudio_dep, gstapp_dep,
+ gstfft_dep, gstvideo_dep, gstpbutils_dep]
libm = cc.find_library('m', required : false)