From 8a16b0de7ca4ce4947e2a843ba9f518f281a9a6e Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Fri, 11 Feb 2022 18:51:16 +0100
Subject: [PATCH] Fix tests
---
.gitlab/ghcup-run.files.windows | 6 +++---
.gitlab/script/ghcup_version.sh | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab/ghcup-run.files.windows b/.gitlab/ghcup-run.files.windows
index 46f33e9b..8c5d6288 100644
--- a/.gitlab/ghcup-run.files.windows
+++ b/.gitlab/ghcup-run.files.windows
@@ -1,5 +1,5 @@
-./
-./cabal
+.
+./cabal.exe
./cabal.shim
./ghc-8.10.7.exe
./ghc-8.10.7.shim
@@ -77,5 +77,5 @@
./runhaskell-8.10.7.shim
./runhaskell.exe
./runhaskell.shim
-./stack
+./stack.exe
./stack.shim
diff --git a/.gitlab/script/ghcup_version.sh b/.gitlab/script/ghcup_version.sh
index e8c91f84..3a101401 100755
--- a/.gitlab/script/ghcup_version.sh
+++ b/.gitlab/script/ghcup_version.sh
@@ -114,7 +114,7 @@ if [ "${ARCH}" = "64" ] ; then
else
expected=$(cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghcup-run.files" | sort)
fi
- actual=$(cd ".bin" && find | sort)
+ actual=$(cd ".bin" && find . | sort)
[ "${actual}" = "${expected}" ]
unset actual expected
rm -rf .bin
@@ -148,7 +148,7 @@ else
eghcup --offline install ghc 8.10.3
if [ "${ARCH}" = "64" ] ; then
expected=$(cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghc-8.10.3-linux.files" | sort)
- actual=$(cd "${GHCUP_DIR}/ghc/8.10.3/" && find | sort)
+ actual=$(cd "${GHCUP_DIR}/ghc/8.10.3/" && find . | sort)
[ "${actual}" = "${expected}" ]
unset actual expected
fi
@@ -156,7 +156,7 @@ else
eghcup prefetch ghc 8.10.3
eghcup --offline install ghc 8.10.3
expected=$(cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghc-8.10.3-windows.files" | sort)
- actual=$(cd "${GHCUP_DIR}/ghc/8.10.3/" && find | sort)
+ actual=$(cd "${GHCUP_DIR}/ghc/8.10.3/" && find . | sort)
[ "${actual}" = "${expected}" ]
unset actual expected
else
--
GitLab