From f481c1890066b4dac78d981ca680fb01cfff9a11 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Wed, 7 Jul 2021 10:46:29 +0100 Subject: packaging: Create both versioned and unversioned executables Before we would just copy the unversioned executable into the bindist. Now the actual executable is copied into the bindist and a version suffix is added. Then a wrapper or symlink is added which points to the versioned executable. Fixes #20074 --- testsuite/driver/testlib.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'testsuite') diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 8d71d1de46..d776c12bb3 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -2221,6 +2221,12 @@ def normalise_errmsg(s: str) -> str: # collisions, so we need to normalise that to just "ghc" s = re.sub('ghc-stage[123]', 'ghc', s) + # On windows error messages can mention versioned executables + s = re.sub('ghc-[0-9.]+', 'ghc', s) + s = re.sub('runghc-[0-9.]+', 'runghc', s) + s = re.sub('hpc-[0-9.]+', 'hpc', s) + s = re.sub('ghc-pkg-[0-9.]+', 'ghc-pkg', s) + # Error messages sometimes contain ghc-bignum implementation package s = re.sub('ghc-bignum-[0-9.]+', 'ghc-bignum-', s) -- cgit v1.2.1