[glib: 3/4] tests: Remove redundant --tap options
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 3/4] tests: Remove redundant --tap options
- Date: Fri, 17 May 2019 12:13:23 +0000 (UTC)
commit 505f45ef95e62fb28a7aa7e3777fd3b53512c05c
Author: Philip Withnall <withnall endlessm com>
Date: Tue May 14 12:41:30 2019 +0100
tests: Remove redundant --tap options
Now that TAP output is used by default, passing `--tap` is unnecessary.
Signed-off-by: Philip Withnall <withnall endlessm com>
Helps: #1619
gio/tests/meson.build | 1 -
glib/tests/meson.build | 3 +--
gobject/tests/meson.build | 3 +--
template-tap.test.in | 2 +-
tests/gobject/meson.build | 4 +---
tests/meson.build | 4 +---
6 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index 98e802ac6..a0c09444b 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -678,7 +678,6 @@ foreach test_name, extra_args : gio_tests
env : local_test_env,
timeout : timeout,
suite : suite,
- args : ['--tap'],
is_parallel : extra_args.get('is_parallel', true),
depends : extra_args.get('depends', []),
)
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index 7aa16d279..c47133f24 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
@@ -204,8 +204,7 @@ foreach test_name, extra_args : glib_tests
suite = ['glib'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
- test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
- args : ['--tap'])
+ test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
endforeach
# test-spawn-echo helper binary required by the spawn tests above
diff --git a/gobject/tests/meson.build b/gobject/tests/meson.build
index 9d08d0a34..7c3e5cd9d 100644
--- a/gobject/tests/meson.build
+++ b/gobject/tests/meson.build
@@ -103,8 +103,7 @@ foreach test_name, extra_args : gobject_tests
timeout = timeout * 10
endif
- test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
- args: ['--tap'])
+ test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
endforeach
test(
diff --git a/template-tap.test.in b/template-tap.test.in
index 30cd16686..c7d50dcf0 100644
--- a/template-tap.test.in
+++ b/template-tap.test.in
@@ -1,4 +1,4 @@
[Test]
Type=session
-Exec=@env@@installed_tests_dir@/@program@ --tap
+Exec=@env@@installed_tests_dir@/@program@
Output=TAP
diff --git a/tests/gobject/meson.build b/tests/gobject/meson.build
index eabaea5b2..24ceda0d3 100644
--- a/tests/gobject/meson.build
+++ b/tests/gobject/meson.build
@@ -60,7 +60,6 @@ foreach test_name, extra_args : gobject_tests
extra_sources = extra_args.get('extra_sources', [])
install = installed_tests_enabled and extra_args.get('install', true)
template = extra_args.get('tap', false) ? installed_tests_template_tap : installed_tests_template
- test_command_args = extra_args.get('tap', false) ? ['--tap'] : []
if install
test_conf = configuration_data()
@@ -86,8 +85,7 @@ foreach test_name, extra_args : gobject_tests
suite = ['gobject'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
# FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
- test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
- args : test_command_args)
+ test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
endforeach
# Don't install these ones, and keep them out of 'make check' because they take too long...
diff --git a/tests/meson.build b/tests/meson.build
index 288c5b847..ce3044258 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -103,7 +103,6 @@ foreach test_name, extra_args : tests
extra_sources = extra_args.get('extra_sources', [])
install = installed_tests_enabled and extra_args.get('install', true)
template = extra_args.get('tap', false) ? installed_tests_template_tap : installed_tests_template
- test_command_args = extra_args.get('tap', false) ? ['--tap'] : []
if install
test_conf = configuration_data()
@@ -131,8 +130,7 @@ foreach test_name, extra_args : tests
suite = ['glib'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
# FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
- test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
- args : test_command_args)
+ test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
endforeach
foreach program_name, extra_args : test_extra_programs
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]