test.bash: call vet early

2 files changed, 7 insertions, 8 deletions

diff --git a/build-without-openssl.bash b/build-without-openssl.bash
index 6b7917f..7c62511 100755
--- a/build-without-openssl.bash
+++ b/build-without-openssl.bash
@@ -4,5 +4,4 @@ set -eu
 
 cd "$(dirname "$0")"
 
-export CGO_ENABLED=0
-exec ./build.bash -tags without_openssl
+CGO_ENABLED=0 ./build.bash -tags without_openssl
diff --git a/test.bash b/test.bash
index 892e6c2..1f90b88 100755
--- a/test.bash
+++ b/test.bash
@@ -26,18 +26,18 @@ done
 source build-without-openssl.bash
 source build.bash
 
-go test ./... $*
-
-# The tests cannot to this themselves as they are run in parallel.
-# Don't descend into possibly still mounted example filesystems.
-rm -Rf --one-file-system $TESTDIR
-
 if go tool | grep vet > /dev/null ; then
 	go tool vet -all -shadow .
 else
 	echo "\"go tool vet\" not available - skipping"
 fi
 
+go test ./... $*
+
+# The tests cannot to this themselves as they are run in parallel.
+# Don't descend into possibly still mounted example filesystems.
+rm -Rf --one-file-system $TESTDIR
+
 if grep -R "panic(" internal ; then
 	echo "Please use log.Panic instead of naked panic!"
 	exit 1