test.bash, crossbuild.bash: drop old Go version kludgesHEADv2.5.2master

GO111MODULE is default on with Go 1.16, same version that gained
darwin/arm64 support.

We only support Go 1.19 and up, so drop the kludges.

2 files changed, 1 insertions, 7 deletions

diff --git a/crossbuild.bash b/crossbuild.bash
index a9fc6ae..db4b05b 100755
--- a/crossbuild.bash
+++ b/crossbuild.bash
@@ -15,7 +15,6 @@ function compile_tests {
 
 set -eux
 
-export GO111MODULE=on
 export CGO_ENABLED=0
 
 GOOS=linux  GOARCH=amd64         build
@@ -30,8 +29,4 @@ GOOS=darwin GOARCH=amd64 build
 time GOOS=darwin GOARCH=amd64 compile_tests
 
 # MacOS on Apple Silicon M1.
-# Go 1.16 added support for the M1 and added ios/arm64,
-# so we use this to check if we should attempt a build.
-if go tool dist list | grep ios/arm64 ; then
-	GOOS=darwin GOARCH=arm64 build
-fi
+GOOS=darwin GOARCH=arm64 build
diff --git a/test.bash b/test.bash
index d126a9e..d701f76 100755
--- a/test.bash
+++ b/test.bash
@@ -22,7 +22,6 @@ else
 fi
 
 cd "$(dirname "$0")"
-export GO111MODULE=on
 MYNAME=$(basename "$0")
 TESTDIR=$TMPDIR/gocryptfs-test-parent-$UID
 mkdir -p "$TESTDIR"