diff options
| author | Brendan Long <self@brendanlong.com> | 2018-04-22 19:31:56 +0300 |
|---|---|---|
| committer | Brendan Long <self@brendanlong.com> | 2018-04-25 16:24:55 +0300 |
| commit | 9fdc62082b4ef458ed28105fded69af9df046a9b (patch) | |
| tree | 41b9272032e17547dad0291987ccbe449750aa68 | |
| parent | ffef443aea1fca84ddae993526bf9f52b907f3e5 (diff) | |
Use gtester for tests again
| -rw-r--r-- | circle.yml | 2 | ||||
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | plugins/backend/feedbin/meson.build | 6 | ||||
| -rw-r--r-- | plugins/backend/local/meson.build | 6 |
4 files changed, 14 insertions, 3 deletions
@@ -47,7 +47,7 @@ jobs: mkdir -p /tmp/test-results/junit/ cd builddir for f in *.gtester.log; do - xsltproc -o /tmp/test-results/junit/$(basename $f .gtester.log).xml gtester-to-junit-4.xsl $f; + xsltproc -o /tmp/test-results/junit/$(basename $f .gtester.log).xml ../gtester-to-junit-4.xsl $f; done when: always - store_test_results: diff --git a/meson.build b/meson.build index 27515c03..7c1db765 100644 --- a/meson.build +++ b/meson.build @@ -32,6 +32,9 @@ i18n = import('i18n') vala_compiler = meson.get_compiler('vala') c_compiler = meson.get_compiler('c') +# Other tools +gtester = find_program('gtester', required:false) + # Dependencies gdk_pixbuf = dependency('gdk-pixbuf-2.0') gee = dependency('gee-0.8') diff --git a/plugins/backend/feedbin/meson.build b/plugins/backend/feedbin/meson.build index bc71a9e5..16f566ed 100644 --- a/plugins/backend/feedbin/meson.build +++ b/plugins/backend/feedbin/meson.build @@ -76,4 +76,8 @@ plugin_test = executable( # FIXME: Why do we get errors like `g_object_new_with_properties: assertion 'G_TYPE_IS_OBJECT (object_type)' failed` # with the new meson build? -#test('Feedbin plugin', plugin_test) +#if gtester.found() +# test('Feedbin plugin', gtester, args:['-k', '-o', meson.build_root() + '/local.gtester.log', plugin_test]) +#else +# test('Feedbin plugin', plugin_test) +#endif diff --git a/plugins/backend/local/meson.build b/plugins/backend/local/meson.build index 47eb5beb..6a51f8a0 100644 --- a/plugins/backend/local/meson.build +++ b/plugins/backend/local/meson.build @@ -88,4 +88,8 @@ plugin_test = executable( include_directories: include_directories('../../..') ) -test('Local plugin', plugin_test) +if gtester.found() + test('Local plugin', gtester, args:['-k', '-o', meson.build_root() + '/local.gtester.log', plugin_test]) +else + test('Local plugin', plugin_test) +endif |