From 435be4da1435315d69bbd837f77bf9f6a0c888f9 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Sun, 24 Apr 2022 10:50:19 +0100
Subject: meson: Depend on Meson 0.50.0

This sacrifices compatibility with Debian 10 to let us simplify how
tests are set up.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 tests/meson.build               | 77 +++++++++++------------------------------
 tests/test-keyring/meson.build  | 13 ++-----
 tests/test-keyring2/meson.build | 13 ++-----
 3 files changed, 25 insertions(+), 78 deletions(-)

(limited to 'tests')

diff --git a/tests/meson.build b/tests/meson.build
index 044cb03e..4e6f639d 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -45,17 +45,6 @@ tap_test = find_program(
   files(project_source_root / 'buildutil/tap-test'),
 )
 
-# TODO: When we depend on Meson 0.50.0, we can use
-# install : get_option('installed_tests')
-# install_dir : installed_testdir
-# instead of
-# install_dir : maybe_installed_testdir
-if get_option('installed_tests')
-  maybe_installed_testdir = installed_testdir
-else
-  maybe_installed_testdir = false
-endif
-
 if can_run_host_binaries
   runtime_repo = custom_target(
     'runtime-repo',
@@ -159,27 +148,15 @@ foreach testcase : c_tests
   endif
 
   if can_run_host_binaries
-    if meson.version().version_compare('>=0.50.0')
-      test(
-        name,
-        tap_test,
-        args : [exe],
-        depends : runtime_repo,
-        env : tests_environment,
-        protocol : 'tap',
-        timeout : options.get('timeout', 30),
-      )
-    else
-      # Fall back to using exit status rather than TAP
-      test(
-        name,
-        tap_test,
-        args : [exe],
-        depends : runtime_repo,
-        env : tests_environment,
-        timeout : options.get('timeout', 30),
-      )
-    endif
+    test(
+      name,
+      tap_test,
+      args : [exe],
+      depends : runtime_repo,
+      env : tests_environment,
+      protocol : 'tap',
+      timeout : options.get('timeout', 30),
+    )
   endif
 endforeach
 
@@ -299,7 +276,8 @@ configure_file(
   configuration : {
     'PACKAGE_VERSION' : meson.project_version(),
   },
-  install_dir : maybe_installed_testdir,
+  install : get_option('installed_tests'),
+  install_dir : installed_testdir,
 )
 
 if get_option('installed_tests')
@@ -388,28 +366,15 @@ foreach testcase : wrapped_tests
   endif
 
   if can_run_host_binaries
-    if meson.version().version_compare('>=0.50.0')
-      test(
-        name,
-        tap_test,
-        args : [meson.current_source_dir() / name],
-        depends : runtime_repo,
-        env : tests_environment,
-        is_parallel : is_parallel,
-        protocol : 'tap',
-        timeout : timeout,
-      )
-    else
-      # Fall back to using exit status rather than TAP
-      test(
-        name,
-        tap_test,
-        args : [meson.current_source_dir() / name],
-        depends : runtime_repo,
-        env : tests_environment,
-        is_parallel : is_parallel,
-        timeout : timeout,
-      )
-    endif
+    test(
+      name,
+      tap_test,
+      args : [meson.current_source_dir() / name],
+      depends : runtime_repo,
+      env : tests_environment,
+      is_parallel : is_parallel,
+      protocol : 'tap',
+      timeout : timeout,
+    )
   endif
 endforeach
diff --git a/tests/test-keyring/meson.build b/tests/test-keyring/meson.build
index fb1c47a3..b0f4851e 100644
--- a/tests/test-keyring/meson.build
+++ b/tests/test-keyring/meson.build
@@ -1,26 +1,17 @@
 # Copyright 2022 Collabora Ltd.
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-if get_option('installed_tests')
-  install_sub = installed_testdir / 'test-keyring'
-else
-  install_sub = false
-endif
-
 foreach file : [
   'README',
   'pubring.gpg',
   'secring.gpg',
 ]
-  # TODO: When we depend on Meson 0.50.0, we can use
-  # install : get_option('installed_tests')
-  # instead of
-  # install_dir : false
   configure_file(
     input : file,
     output : file,
     copy : true,
-    install_dir : install_sub,
+    install : get_option('installed_tests'),
+    install_dir : installed_testdir / 'test-keyring',
     install_mode : 'rw-r--r--',
   )
 endforeach
diff --git a/tests/test-keyring2/meson.build b/tests/test-keyring2/meson.build
index 9715c4cc..0c653a08 100644
--- a/tests/test-keyring2/meson.build
+++ b/tests/test-keyring2/meson.build
@@ -1,26 +1,17 @@
 # Copyright 2022 Collabora Ltd.
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-if get_option('installed_tests')
-  install_sub = installed_testdir / 'test-keyring2'
-else
-  install_sub = false
-endif
-
 foreach file : [
   'README',
   'pubring.gpg',
   'secring.gpg',
 ]
-  # TODO: When we depend on Meson 0.50.0, we can use
-  # install : get_option('installed_tests')
-  # instead of
-  # install_dir : false
   configure_file(
     input : file,
     output : file,
     copy : true,
-    install_dir : install_sub,
+    install : get_option('installed_tests'),
+    install_dir : installed_testdir / 'test-keyring2',
     install_mode : 'rw-r--r--',
   )
 endforeach
-- 
cgit v1.2.1