From 8fc66dbf9f95c707f57c7714b0ee1c88338d4bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Sat, 1 Dec 2018 21:15:33 +0000
Subject: [PATCH] meson: tests: subset: no need to check for 'which' command
 any more

Test runner script now handles that.
---
 test/subset/meson.build | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/test/subset/meson.build b/test/subset/meson.build
index 8e6d1ca3f..7be3c473e 100644
--- a/test/subset/meson.build
+++ b/test/subset/meson.build
@@ -1,23 +1,16 @@
-tests = [
-  ['basics.tests'],
-  ['full-font.tests'],
-  ['japanese.tests'],
-]
+tests = ['basics', 'full-font', 'japanese']
 
-# The test tries to run which unconditionally, windows doesn't agree
-if find_program('which', required: false).found()
-  foreach test_data : tests
-    fname = test_data[0]
+run_test = find_program('run-tests.py')
 
-    test_name = fname.split('.')[0].underscorify()
+foreach t : tests
+  fname = '@0@.tests'.format(t)
+
+  test(t, run_test,
+    args: [
+      hb_subset,
+      join_paths(meson.current_source_dir(), 'data', 'tests', fname),
+    ],
+    workdir: join_paths(meson.current_build_dir(), '..', '..'),
+  )
+endforeach
 
-    test(test_name, python3,
-      args: [
-        files('run-tests.py')[0],
-        hb_subset,
-        join_paths(meson.current_source_dir(), 'data/tests', fname),
-      ],
-      workdir: join_paths(meson.current_build_dir(), '..', '..'),
-    )
-  endforeach
-endif
\ No newline at end of file