Skip to content

Commit

Permalink
tests: Enable testing on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
seungha-yang authored and tp-m committed Dec 18, 2018
1 parent 1edb2c4 commit 90e801e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
8 changes: 3 additions & 5 deletions meson.build
Expand Up @@ -300,11 +300,9 @@ gst_base_dep = dependency('gstreamer-base-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_base_dep'])
gst_net_dep = dependency('gstreamer-net-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_net_dep'])
if host_system != 'windows'
gst_check_dep = dependency('gstreamer-check-1.0', version : gst_req,
required : get_option('tests'),
fallback : ['gstreamer', 'gst_check_dep'])
endif
gst_check_dep = dependency('gstreamer-check-1.0', version : gst_req,
required : get_option('tests'),
fallback : ['gstreamer', 'gst_check_dep'])
gst_controller_dep = dependency('gstreamer-controller-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_controller_dep'])

Expand Down
7 changes: 2 additions & 5 deletions tests/meson.build
@@ -1,8 +1,5 @@
# FIXME: make check work on windows
if host_machine.system() != 'windows'
if not get_option('tests').disabled() and gst_check_dep.found()
subdir('check')
endif
if not get_option('tests').disabled() and gst_check_dep.found()
subdir('check')
endif
if not get_option('examples').disabled()
subdir('examples')
Expand Down

0 comments on commit 90e801e

Please sign in to comment.