luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-16 12:28:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

tests: Remove redundant --tap options

Browse Source 
Now that TAP output is used by default, passing `--tap` is unnecessary.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Helps: #1619
This commit is contained in:
Philip Withnall 2019-05-14 12:41:30 +01:00
parent ad17576657
commit 505f45ef95
6 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gio/tests/meson.build
View File

@ -678,7 +678,6 @@ foreach test_name, extra_args : gio_tests
env : local_test_env, env : local_test_env,
timeout : timeout, timeout : timeout,
suite : suite, suite : suite,
args : ['--tap'],
is_parallel : extra_args.get('is_parallel', true), is_parallel : extra_args.get('is_parallel', true),
depends : extra_args.get('depends', []), depends : extra_args.get('depends', []),
) )

3
glib/tests/meson.build
View File

@ -204,8 +204,7 @@ foreach test_name, extra_args : glib_tests
suite = ['glib'] + extra_args.get('suite', []) suite = ['glib'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
test(test_name, exe, env : test_env, timeout : timeout, suite : suite, test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
args : ['--tap'])
endforeach endforeach
# test-spawn-echo helper binary required by the spawn tests above # test-spawn-echo helper binary required by the spawn tests above

3
gobject/tests/meson.build
View File

@ -103,8 +103,7 @@ foreach test_name, extra_args : gobject_tests
timeout = timeout * 10 timeout = timeout * 10
endif endif
test(test_name, exe, env : test_env, timeout : timeout, suite : suite, test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
args: ['--tap'])
endforeach endforeach
test( test(

2
template-tap.test.in
View File

@ -1,4 +1,4 @@
[Test] [Test]
Type=session Type=session
Exec=@env@@installed_tests_dir@/@program@ --tap Exec=@env@@installed_tests_dir@/@program@
Output=TAP Output=TAP

4
tests/gobject/meson.build
View File

@ -60,7 +60,6 @@ foreach test_name, extra_args : gobject_tests
extra_sources = extra_args.get('extra_sources', []) extra_sources = extra_args.get('extra_sources', [])
install = installed_tests_enabled and extra_args.get('install', true) install = installed_tests_enabled and extra_args.get('install', true)
template = extra_args.get('tap', false) ? installed_tests_template_tap : installed_tests_template template = extra_args.get('tap', false) ? installed_tests_template_tap : installed_tests_template
test_command_args = extra_args.get('tap', false) ? ['--tap'] : []
if install if install
test_conf = configuration_data() test_conf = configuration_data()
@ -86,8 +85,7 @@ foreach test_name, extra_args : gobject_tests
suite = ['gobject'] + extra_args.get('suite', []) suite = ['gobject'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
# FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
test(test_name, exe, env : test_env, timeout : timeout, suite : suite, test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
args : test_command_args)
endforeach endforeach
# Don't install these ones, and keep them out of 'make check' because they take too long... # Don't install these ones, and keep them out of 'make check' because they take too long...

4
tests/meson.build
View File

@ -103,7 +103,6 @@ foreach test_name, extra_args : tests
extra_sources = extra_args.get('extra_sources', []) extra_sources = extra_args.get('extra_sources', [])
install = installed_tests_enabled and extra_args.get('install', true) install = installed_tests_enabled and extra_args.get('install', true)
template = extra_args.get('tap', false) ? installed_tests_template_tap : installed_tests_template template = extra_args.get('tap', false) ? installed_tests_template_tap : installed_tests_template
test_command_args = extra_args.get('tap', false) ? ['--tap'] : []
if install if install
test_conf = configuration_data() test_conf = configuration_data()
@ -131,8 +130,7 @@ foreach test_name, extra_args : tests
suite = ['glib'] + extra_args.get('suite', []) suite = ['glib'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
# FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
test(test_name, exe, env : test_env, timeout : timeout, suite : suite, test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
args : test_command_args)
endforeach endforeach
foreach program_name, extra_args : test_extra_programs foreach program_name, extra_args : test_extra_programs