X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=test%2Fintegration%2Fmeson.build;h=899de35e87d41d8b45c12c793863d97ce221c371;hb=c6a15e27d934e90a1f3a26438dddb395bdc9de19;hp=1c3b9ea15d98e6ec0c0177328bf0785163aa3cbc;hpb=94520716cb6ca59fc83c0c39021a085b42cda54b;p=tinc

diff --git a/test/integration/meson.build b/test/integration/meson.build
index 1c3b9ea1..899de35e 100644
--- a/test/integration/meson.build
+++ b/test/integration/meson.build
@@ -1,27 +1,40 @@
 tests = [
-  'basic.test',
-  'commandline.test',
-  'executables.test',
-  'import-export.test',
-  'invite-join.test',
-  'invite-offline.test',
-  'invite-tinc-up.test',
-  'scripts.test',
-  'security.test',
-  'variables.test',
+  'address_cache.py',
+  'basic.py',
+  'cmd_dump.py',
+  'cmd_fsck.py',
+  'cmd_import.py',
+  'cmd_join.py',
+  'cmd_keys.py',
+  'cmd_misc.py',
+  'cmd_net.py',
+  'cmd_sign_verify.py',
+  'commandline.py',
+  'executables.py',
+  'import_export.py',
+  'invite.py',
+  'invite_tinc_up.py',
+  'proxy.py',
+  'sandbox.py',
+  'scripts.py',
+  'security.py',
+  'splice.py',
+  'sptps_basic.py',
+  'variables.py',
 ]
 
 if opt_crypto != 'nolegacy'
-  tests += 'algorithms.test'
-  tests += 'legacy-protocol.test'
-endif
-
-if os_name != 'windows'
-  tests += 'sptps-basic.test'
+  tests += [
+    'algorithms.py',
+    'legacy_protocol.py',
+  ]
 endif
 
 if os_name == 'linux'
-  tests += 'ns-ping.test'
+  tests += [
+    'ns_ping.py',
+    'compression.py',
+  ]
 endif
 
 exe_splice = executable(
@@ -33,13 +46,14 @@ exe_splice = executable(
   build_by_default: false,
 )
 
-env = environment()
-env.set('TINC_PATH', exe_tinc.full_path())
-env.set('TINCD_PATH', exe_tincd.full_path())
-env.set('SPTPS_TEST_PATH', exe_sptps_test.full_path())
-env.set('SPTPS_KEYPAIR_PATH', exe_sptps_keypair.full_path())
-env.set('SPLICE_PATH', exe_splice.full_path())
-env.set('TESTLIB_PATH', meson.current_source_dir() / 'testlib.sh')
+env_vars = {
+  'TINC_PATH': exe_tinc.full_path(),
+  'TINCD_PATH': exe_tincd.full_path(),
+  'PYTHON_PATH': python_path,
+  'SPLICE_PATH': exe_splice.full_path(),
+  'SPTPS_TEST_PATH': exe_sptps_test.full_path(),
+  'SPTPS_KEYPAIR_PATH': exe_sptps_keypair.full_path(),
+}
 
 deps_test = [
   exe_tinc,
@@ -50,13 +64,24 @@ deps_test = [
 ]
 
 test_wd = meson.current_build_dir()
+test_src = meson.current_source_dir()
 
 foreach test_name : tests
-  target = find_program(test_name, native: true)
+  if meson_version.version_compare('>=0.52')
+    env = environment(env_vars)
+  else
+    env = environment()
+    foreach k, v : env_vars
+      env.set(k, v)
+    endforeach
+  endif
+  env.set('TEST_NAME', test_name)
+
   test(test_name,
-       target,
+       python,
+       args: test_src / test_name,
        suite: 'integration',
-       timeout: 5 * 60,
+       timeout: 60,
        env: env,
        depends: deps_test,
        workdir: test_wd)