Imported Upstream version 2.74.0

[platform/upstream/glib-networking.git] / proxy / tests / meson.build

diff --git a/proxy/tests/meson.build b/proxy/tests/meson.build
index 4e0079f..ce0d8d0 100644 (file)
--- a/proxy/tests/meson.build
+++ b/proxy/tests/meson.build
@@ -1,28 +1,28 @@
-cflags = [
-  '-DSRCDIR="@0@"'.format(meson.current_source_dir()),
-  '-DTOP_BUILDDIR="@0@"'.format(meson.build_root())
-]
-
 foreach program: proxy_test_programs
   test_conf = configuration_data()
   test_conf.set('installed_tests_dir', installed_tests_execdir)
   test_conf.set('program', program[0])
+  test_conf.set('environment', 'GIO_PROXY_TEST_NAME=' + program[1])
+
+  test_name = program[0]
+  if program[0] != program[1]
+    test_name = program[0] + '-' + program[1]
+  endif
 
   if enable_installed_tests
     configure_file(
       input: test_template,
-      output: program[0] + '.test',
+      output: test_name + '.test',
       install_dir: installed_tests_metadir,
       configuration: test_conf
     )
   endif
 
   exe = executable(
-    program[0],
+    test_name,
     program[0] + '.c',
     include_directories: top_inc,
-    dependencies: program[1],
-    c_args: cflags,
+    dependencies: program[2],
     install: enable_installed_tests,
     install_dir: installed_tests_execdir
   )
@@ -30,11 +30,12 @@ foreach program: proxy_test_programs
   envs = [
     'G_TEST_SRCDIR=' + meson.current_source_dir(),
     'G_TEST_BUILDDIR=' + meson.current_build_dir(),
-    'GIO_MODULE_DIR=' + join_paths(meson.build_root(), 'proxy', program[0])
+    'GIO_MODULE_DIR=' + join_paths(meson.project_build_root(), 'proxy', program[1]),
+    'GIO_PROXY_TEST_NAME=' + program[1]
   ]
 
   test(
-    program[0],
+    test_name,
     exe,
     env: envs
   )