From 02a4f0bf28ff857a95d6caaf8935015c3bfae728 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Mon, 5 Jun 2023 13:49:20 -0400 Subject: [PATCH] Revert "tests: Stop copying the tool tests" This reverts commit bb3a6214cbeaa3211be007192e536bd473323836. This is actually used by the installed tests which we also had to revert dropping (in a separate patch) Gbp-Pq: Name Revert-tests-Stop-copying-the-tool-tests.patch --- testsuite/tools/{enumerate => enumerate.in} | 0 testsuite/tools/meson.build | 8 ++++++-- testsuite/tools/{settings => settings.in} | 0 testsuite/tools/{simplify-3to4 => simplify-3to4.in} | 0 testsuite/tools/{simplify => simplify.in} | 0 testsuite/tools/{validate => validate.in} | 0 6 files changed, 6 insertions(+), 2 deletions(-) rename testsuite/tools/{enumerate => enumerate.in} (100%) rename testsuite/tools/{settings => settings.in} (100%) rename testsuite/tools/{simplify-3to4 => simplify-3to4.in} (100%) rename testsuite/tools/{simplify => simplify.in} (100%) rename testsuite/tools/{validate => validate.in} (100%) diff --git a/testsuite/tools/enumerate b/testsuite/tools/enumerate.in similarity index 100% rename from testsuite/tools/enumerate rename to testsuite/tools/enumerate.in diff --git a/testsuite/tools/meson.build b/testsuite/tools/meson.build index 239e1b0e04..e19a8195d6 100644 --- a/testsuite/tools/meson.build +++ b/testsuite/tools/meson.build @@ -3,8 +3,12 @@ if bash.found() test_env = environment() foreach t : ['simplify', 'simplify-3to4', 'validate', 'enumerate', 'settings'] - test(t, - find_program(t, dirs: meson.current_source_dir()), + configure_file(output: t, + input: '@0@.in'.format(t), + copy: true, + ) + test(t, bash, + args: t, workdir: meson.current_build_dir(), protocol: 'tap', env: [ diff --git a/testsuite/tools/settings b/testsuite/tools/settings.in similarity index 100% rename from testsuite/tools/settings rename to testsuite/tools/settings.in diff --git a/testsuite/tools/simplify-3to4 b/testsuite/tools/simplify-3to4.in similarity index 100% rename from testsuite/tools/simplify-3to4 rename to testsuite/tools/simplify-3to4.in diff --git a/testsuite/tools/simplify b/testsuite/tools/simplify.in similarity index 100% rename from testsuite/tools/simplify rename to testsuite/tools/simplify.in diff --git a/testsuite/tools/validate b/testsuite/tools/validate.in similarity index 100% rename from testsuite/tools/validate rename to testsuite/tools/validate.in -- 2.30.2