From d26d5b83f10d16a162d234b0b08c5fca654679dc Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 29 Sep 2017 13:43:44 +1000
Subject: [PATCH] test: set RATBAG_TEST in code, not in meson

It's a fixed value so it's much easier to set this in the test binaries rather
than requiring the user to set this in the env before running a test manually.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 meson.build              | 15 ++++++---------
 test/test-context.c      |  2 ++
 test/test-device.c       |  2 ++
 test/test-iconv-helper.c |  2 ++
 test/test-util.c         |  2 ++
 tools/ratbagctl.test.in  |  1 +
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/meson.build b/meson.build
index a45312ff..41aa890a 100644
--- a/meson.build
+++ b/meson.build
@@ -336,15 +336,11 @@ test_svg_files = find_program('data/gnome/check-svg.py')
 test('check-svg', test_svg_files, args : gnome_svg_files)
 
 #### tests ####
-env_test = environment()
-env_test.set('LIBRATBAG_DATA_DIR', libratbag_data_dir_devel)
-
 enable_tests = get_option('enable-tests')
 if enable_tests
 	dep_check = dependency('check', version: '>= 0.9.10')
 
 	config_h.set('BUILD_TESTS', '1')
-	env_test.set('RATBAG_TEST', '1')
 
 	test_context = executable('test-context',
 				  ['test/test-context.c'],
@@ -368,10 +364,10 @@ if enable_tests
 						 dep_libutil],
 				include_directories : include_directories('src'),
 				install : false)
-	test('test-context', test_context, env : env_test)
-	test('test-device', test_device, env : env_test)
-	test('test-util', test_util, env : env_test)
-	test('test-iconv-helper', test_iconv_helper, env : env_test)
+	test('test-context', test_context)
+	test('test-device', test_device)
+	test('test-util', test_util)
+	test('test-iconv-helper', test_iconv_helper)
 
 	valgrind = find_program('valgrind')
 	valgrind_suppressions_file = join_paths(meson.source_root(), 'test', 'valgrind.suppressions')
@@ -382,7 +378,6 @@ if enable_tests
 			       '--quiet',
 			       '--error-exitcode=3',
 			       '--suppressions=' + valgrind_suppressions_file ],
-		       env : env_test,
 		       timeout_multiplier: 5)
 
 	executable('test-build-cxx',
@@ -529,6 +524,8 @@ configure_file(input : 'tools/ratbagctl.devel.in',
 configure_file(input : 'tools/ratbagctl.test.in',
 	       output : 'ratbagctl.test',
 	       configuration : config_ratbagctl_devel)
+env_test = environment()
+env_test.set('LIBRATBAG_DATA_DIR', libratbag_data_dir_devel)
 ratbagctl_test = find_program(join_paths(meson.build_root(), 'ratbagctl.test'))
 test('ratbagctl-test', ratbagctl_test, args: ['-v'], env : env_test)
 
diff --git a/test/test-context.c b/test/test-context.c
index 48aa80e3..c9236bb7 100644
--- a/test/test-context.c
+++ b/test/test-context.c
@@ -165,6 +165,8 @@ int main(void)
 	bool using_valgrind;
 	const struct rlimit corelimit = { 0, 0 };
 
+	setenv("RATBAG_TEST", "1", 0);
+
 	setrlimit(RLIMIT_CORE, &corelimit);
 
 	/* when running under valgrind we're using nofork mode, so a
diff --git a/test/test-device.c b/test/test-device.c
index 1210f295..a568e635 100644
--- a/test/test-device.c
+++ b/test/test-device.c
@@ -935,6 +935,8 @@ int main(void)
 	SRunner *sr;
 	const struct rlimit corelimit = { 0, 0 };
 
+	setenv("RATBAG_TEST", "1", 0);
+
 	setrlimit(RLIMIT_CORE, &corelimit);
 
 	s = test_context_suite();
diff --git a/test/test-iconv-helper.c b/test/test-iconv-helper.c
index b3049243..03546e6e 100644
--- a/test/test-iconv-helper.c
+++ b/test/test-iconv-helper.c
@@ -169,6 +169,8 @@ int main(void)
 	SRunner *sr;
 	const struct rlimit corelimit = { 0, 0 };
 
+	setenv("RATBAG_TEST", "1", 0);
+
 	setrlimit(RLIMIT_CORE, &corelimit);
 
 	s = test_context_suite();
diff --git a/test/test-util.c b/test/test-util.c
index ce01f087..5598a20e 100644
--- a/test/test-util.c
+++ b/test/test-util.c
@@ -144,6 +144,8 @@ int main(void)
 	SRunner *sr;
 	const struct rlimit corelimit = { 0, 0 };
 
+	setenv("RATBAG_TEST", "1", 0);
+
 	setrlimit(RLIMIT_CORE, &corelimit);
 
 	s = test_context_suite();
diff --git a/tools/ratbagctl.test.in b/tools/ratbagctl.test.in
index a7d1f137..3831f470 100755
--- a/tools/ratbagctl.test.in
+++ b/tools/ratbagctl.test.in
@@ -590,6 +590,7 @@ def main(argv):
     if not os.geteuid() == 0:
         sys.exit('Script must be run as root')
 
+    os.environ['RATBAG_TEST'] = '1'
     resource.setrlimit(resource.RLIMIT_CORE, (0, 0))
 
     args = parse(argv)