summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <withnall@endlessm.com>2019-08-21 12:47:06 +0300
committerPhilip Withnall <withnall@endlessm.com>2019-08-21 12:47:06 +0300
commitad9697a70b784685dad66fd893c18b18bca66dee (patch)
treedf29e37a1b67529220ef7ffb6b843186344a4ed2
parent43c6e45e14267cd4b932b3f3824bf3438466f18d (diff)
downloadlibgdata-ad9697a70b784685dad66fd893c18b18bca66dee.tar.gz
build: Don’t install tests which are expected to fail
There’s no way to annotate an installed-test to say it’s expected to fail, so don’t install tests which are expected to fail. The PicasaWeb tests are expected to fail because the server for them has been shut down (see #19). The Documents tests are expected to fail because they haven’t been ported to Drive v2 yet (see #12). Signed-off-by: Philip Withnall <withnall@endlessm.com> Fixes: #35
-rw-r--r--gdata/tests/meson.build8
1 files changed, 5 insertions, 3 deletions
diff --git a/gdata/tests/meson.build b/gdata/tests/meson.build
index 6c147d32..05184deb 100644
--- a/gdata/tests/meson.build
+++ b/gdata/tests/meson.build
@@ -40,6 +40,7 @@ test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
foreach test_name, extra_args: tests
+ should_fail = extra_args.get('should_fail', false)
exe = executable(
test_name,
test_name + '.c',
@@ -47,7 +48,7 @@ foreach test_name, extra_args: tests
include_directories: top_inc_dir,
dependencies: common_deps + extra_args.get('dependencies', []),
sources: tests_sources,
- install: install_tests,
+ install: install_tests and not should_fail,
install_dir: tests_execdir,
)
@@ -55,12 +56,13 @@ foreach test_name, extra_args: tests
test_name,
exe,
env: test_env,
- should_fail: extra_args.get('should_fail', false),
+ should_fail: should_fail,
)
endforeach
if install_tests
foreach test_name, extra_args: tests
+ should_fail = extra_args.get('should_fail', false)
tests_conf = {
'TEST_TYPE': 'session',
'TEST_ABS_PATH': gdata_prefix / tests_execdir / test_name,
@@ -70,7 +72,7 @@ if install_tests
input: 'template.test.in',
output: test_name + '.test',
configuration: tests_conf,
- install: true,
+ install: not should_fail,
install_dir: tests_metadir,
)
endforeach