From d6238445161d5d3f98df262d1130f868a411265a Mon Sep 17 00:00:00 2001
From: Rail Aliiev <rail@iqchoice.com>
Date: Mon, 5 Feb 2024 18:42:19 -0500
Subject: [PATCH] bincheck: do not run geos tests on Windows

In #106642 we stopped shipping libgeos on Windows, but didn't update the
bincheck test to reflect the change.

Epic: none
Release note: None
---
 build/release/bincheck/bincheck           | 2 +-
 build/release/bincheck/download_binary.sh | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/build/release/bincheck/bincheck b/build/release/bincheck/bincheck
index 9478e1a995d7..ee47b5b2fdee 100755
--- a/build/release/bincheck/bincheck
+++ b/build/release/bincheck/bincheck
@@ -57,7 +57,7 @@ EOF
 diff -u expected actual
 
 # Verify libgeos functionality on all platforms except MacOS ARM64 and Windows
-if [[ $(uname -om) == "Darwin arm64" ]]; then
+if [[ $(uname -om) == "Darwin arm64" || $(uname -o) == "Msys" ]]; then
   echo "Skipping libgeos tests"
 else
   echo "Testing libgeos functionality"
diff --git a/build/release/bincheck/download_binary.sh b/build/release/bincheck/download_binary.sh
index 3fba8260dd58..c0b08c44e921 100755
--- a/build/release/bincheck/download_binary.sh
+++ b/build/release/bincheck/download_binary.sh
@@ -17,8 +17,6 @@ download_and_extract() {
   else
     curl -sSfL "${binary_url}" > cockroach.zip
     7z e -omnt cockroach.zip
-    mkdir -p mnt/lib
-    mv mnt/*.dll mnt/lib/
   fi
 
   echo "Downloaded ${binary_url}"