From 87408f5f22e627597dbc01318a13ae71c6b1b2de Mon Sep 17 00:00:00 2001 From: Geod24 Date: Tue, 29 Dec 2020 15:22:07 +0900 Subject: [PATCH 1/2] Upgrade double_install test to work on newer OSX Versions prior to v2.087.1 do not work on Mac OSX 10.15, so upgrade the versions as they are inconsequential to the test. --- test/t/double_install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/t/double_install.sh b/test/t/double_install.sh index 84805dbc..4ecffc2b 100755 --- a/test/t/double_install.sh +++ b/test/t/double_install.sh @@ -7,10 +7,10 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/../ priorDMD=$(dmd --version || echo "no dmd") -. $(./script/install.sh install dmd-2.082.1 -a) +. $(./script/install.sh install dmd-2.090.1 -a) test "$(dmd --version | grep -oE '[^ ]+$' | head -n1 | tr -d '\r')" = "v2.082.1" -. $(./script/install.sh install dmd-2.083.1 -a) +. $(./script/install.sh install dmd-2.091.1 -a) test "$(dmd --version | grep -oE '[^ ]+$' | head -n1 | tr -d '\r')" = "v2.083.1" deactivate From e65953afe6e86660cf1f4fc80de5495dfd403ef4 Mon Sep 17 00:00:00 2001 From: Geod24 Date: Tue, 29 Dec 2020 15:27:36 +0900 Subject: [PATCH 2/2] Upgrade tested version to something more recent The versions used in the test were very old, and none of them would work on a recent OSX machine. Due to the age of such release, they could also confuse new contributors as many bugfixes / features were missing. --- test/t/base.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/test/t/base.sh b/test/t/base.sh index 79250801..b01f9c24 100755 --- a/test/t/base.sh +++ b/test/t/base.sh @@ -3,12 +3,12 @@ set -uexo pipefail compilers=( - dmd-2.064 - dmd-2.069.2 - dmd-2.071.2 - dmd-2.077.1 - dmd-master-2018-10-14 - ldc-1.4.0 + dmd-2.094.0 + dmd-2.089.2 + dmd-2.091.2 + dmd-2.087.1 + dmd-master-2020-05-10 + ldc-1.24.0 ) versions=( @@ -16,17 +16,17 @@ versions=( 'DMD64 D Compiler v2.069.2' 'DMD64 D Compiler v2.071.2' 'DMD64 D Compiler v2.077.1' - 'DMD64 D Compiler v2.082.1-master-54b676b' - 'LDC - the LLVM D compiler (1.4.0):' + 'DMD64 D Compiler v2.090.0-beta.1-master-49dfbe5' + 'LDC - the LLVM D compiler (1.24.0):' ) frontendVersions=( - '2064' - '2069' - '2071' - '2077' - '2082' - '2074' + '2094' + '2089' + '2091' + '2087' + '2090' + '2094' ) if [ "${TRAVIS_OS_NAME:-}" = "linux" ]; then