[vala/wip/meson] move add_test_setup



commit fc149b80a0766bba5c9290c428969335e31712c9
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Mon Feb 11 13:12:02 2019 +0100

    move add_test_setup

 meson.build       | 11 +++++++++++
 tests/meson.build | 11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/meson.build b/meson.build
index f3c2f99aa..185853d5d 100644
--- a/meson.build
+++ b/meson.build
@@ -146,6 +146,17 @@ if valadoc_enabled and cc.run('''#include <gvc.h>
        add_project_arguments('-D', 'WITH_CGRAPH', language: 'vala')
 endif
 
+add_test_setup('default', is_default: true, env: 'G_SLICE=debug-blocks G_DEBUG=fatal-warnings')
+
+vg = find_program('valgrind', required: false)
+if (vg.found())
+       add_test_setup('valgrind',
+               env: 'G_SLICE=always-malloc G_DEBUG=fatal-warnings',
+               exe_wrapper: [vg, '--error-exitcode=1', '--leak-check=full', '--track-origins=yes'],
+               timeout_multiplier: 100,
+       )
+endif
+
 subdir('gobject-introspection')
 subdir('gee')
 subdir('vala')
diff --git a/tests/meson.build b/tests/meson.build
index f93d45a49..0cf38044a 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -706,17 +706,6 @@ foreach flag : supported_test_cflags
        vala_flags += ['-X', flag]
 endforeach
 
-add_test_setup('default', is_default: true, env: 'G_SLICE=debug-blocks G_DEBUG=fatal-warnings')
-
-vg = find_program('valgrind', required: false)
-if (vg.found())
-       add_test_setup('valgrind',
-               env: 'G_SLICE=always-malloc G_DEBUG=fatal-warnings',
-               exe_wrapper: [vg, '--error-exitcode=1', '--leak-check=full', '--track-origins=yes'],
-               timeout_multiplier: 10,
-       )
-endif
-
 preparetest = find_program('prepare-test.py')
 
 foreach case : test_cases


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]