From 260af1289101886fc5b5508c0f38ef92ead58263 Mon Sep 17 00:00:00 2001 From: "Alejandro R. Mosteo" Date: Sun, 16 Jun 2024 14:52:48 +0200 Subject: [PATCH] fix: harmonize fake GNAT external versions in testsuite --- .../gn/gnat_external/gnat_external-external.toml | 6 +++--- .../gn/gnat_external/gnat_external-external.toml | 6 +++--- .../gn/gnat_external/gnat_external-external.toml | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/testsuite/fixtures/basic_index/gn/gnat_external/gnat_external-external.toml b/testsuite/fixtures/basic_index/gn/gnat_external/gnat_external-external.toml index f1171a6ba..b52e5b9b9 100644 --- a/testsuite/fixtures/basic_index/gn/gnat_external/gnat_external-external.toml +++ b/testsuite/fixtures/basic_index/gn/gnat_external/gnat_external-external.toml @@ -5,8 +5,8 @@ maintainers = ["alejandro@mosteo.com"] maintainers-logins = ["mosteo"] [[external]] +# Fake GNAT version that cannot conflict with any real one kind = "version-output" -# We look for make instead that should be always installed. -version-command = ["make", "--version"] -version-regexp = ".*Make ([\\d\\.]+).*" +version-command = ["echo", "1.0"] +version-regexp = "([\\d\\.]+).*" provides = "gnat" diff --git a/testsuite/fixtures/compiler_only_index/gn/gnat_external/gnat_external-external.toml b/testsuite/fixtures/compiler_only_index/gn/gnat_external/gnat_external-external.toml index f1171a6ba..b52e5b9b9 100644 --- a/testsuite/fixtures/compiler_only_index/gn/gnat_external/gnat_external-external.toml +++ b/testsuite/fixtures/compiler_only_index/gn/gnat_external/gnat_external-external.toml @@ -5,8 +5,8 @@ maintainers = ["alejandro@mosteo.com"] maintainers-logins = ["mosteo"] [[external]] +# Fake GNAT version that cannot conflict with any real one kind = "version-output" -# We look for make instead that should be always installed. -version-command = ["make", "--version"] -version-regexp = ".*Make ([\\d\\.]+).*" +version-command = ["echo", "1.0"] +version-regexp = "([\\d\\.]+).*" provides = "gnat" diff --git a/testsuite/fixtures/gnat_toolchain_index/gn/gnat_external/gnat_external-external.toml b/testsuite/fixtures/gnat_toolchain_index/gn/gnat_external/gnat_external-external.toml index 6a899f8d1..b52e5b9b9 100644 --- a/testsuite/fixtures/gnat_toolchain_index/gn/gnat_external/gnat_external-external.toml +++ b/testsuite/fixtures/gnat_toolchain_index/gn/gnat_external/gnat_external-external.toml @@ -5,6 +5,7 @@ maintainers = ["alejandro@mosteo.com"] maintainers-logins = ["mosteo"] [[external]] +# Fake GNAT version that cannot conflict with any real one kind = "version-output" version-command = ["echo", "1.0"] version-regexp = "([\\d\\.]+).*"