Merge branch 'installed-tests' into 'master'

Get GTK+ 4 installed-tests closer to working

See merge request GNOME/gtk!348
This commit is contained in:
Matthias Clasen 2018-09-19 11:59:16 +00:00
commit 5b2a451e75
6 changed files with 8 additions and 6 deletions

View File

@ -44,6 +44,8 @@ a11y_state_tests = [
a11y_dump_bin = executable('accessibility-dump', a11y_dump_bin = executable('accessibility-dump',
'accessibility-dump.c', 'accessibility-dump.c',
dependencies: libgtk_dep, dependencies: libgtk_dep,
install: get_option('install-tests'),
install_dir: testexecdir,
) )
foreach t: a11y_state_tests foreach t: a11y_state_tests

View File

@ -118,9 +118,9 @@ if add_languages('cpp', required: false)
if get_option('install-tests') if get_option('install-tests')
conf = configuration_data() conf = configuration_data()
conf.set('testexecdir', testexecdir) conf.set('testexecdir', testexecdir)
conf.set('test', 'keywords') conf.set('test', 'autotestkeywords')
configure_file(input: 'gtk.test.in', configure_file(input: 'gtk.test.in',
output: 'keywords.test', output: 'autotestkeywords.test',
configuration: conf, configuration: conf,
install_dir: testdatadir) install_dir: testdatadir)
endif endif

View File

@ -1,4 +1,4 @@
[Test] [Test]
Exec=/bin/sh -c "env GTK_THEME=Adwaita:dark G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests" Exec=/bin/sh -c "env GTK_THEME=Adwaita:dark G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests"
Type=session-exclusive Type=session-exclusive
Output=TAP Output=TAP

View File

@ -1,4 +1,4 @@
[Test] [Test]
Exec=/bin/sh -c "env GTK_THEME=HighContrast G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests" Exec=/bin/sh -c "env GTK_THEME=HighContrast G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests"
Type=session-exclusive Type=session-exclusive
Output=TAP Output=TAP

View File

@ -1,4 +1,4 @@
[Test] [Test]
Exec=/bin/sh -c "env GTK_THEME=HighContrastInverse G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests" Exec=/bin/sh -c "env GTK_THEME=HighContrastInverse G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests"
Type=session-exclusive Type=session-exclusive
Output=TAP Output=TAP

View File

@ -1,4 +1,4 @@
[Test] [Test]
Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests" Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk-4.0/reftests"
Type=session-exclusive Type=session-exclusive
Output=TAP Output=TAP