From 64a43bef32b144ce9894815a92f7083306f7ef1e Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 20 Apr 2021 19:53:07 +0200
Subject: [PATCH] Revert "ci: run tests with verbose output"

This reverts commit 444e9874424580361e00547b597d213370045057.

Turns out this is too noisy and less useful than I expected.
---
 .builds/archlinux.yml | 4 ++--
 .builds/freebsd.yml   | 4 ++--
 .builds/openbsd.yml   | 4 ++--
 .gitlab-ci.yml        | 2 +-
 Makefile              | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml
index 90b0897..d8ebea7 100644
--- a/.builds/archlinux.yml
+++ b/.builds/archlinux.yml
@@ -4,7 +4,7 @@ packages:
 tasks:
   - all: |
       cd safcm
-      ./ci/run TESTFLAGS=-v
+      ./ci/run
       # Also run all tests as root
       sudo chown -Rh root:root .
-      sudo ./ci/run TESTFLAGS=-v
+      sudo ./ci/run
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 6f560cf..e5dba6d 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -6,7 +6,7 @@ tasks:
   - all: |
       sudo ln -sf /usr/local/bin/gmake /usr/bin/make
       cd safcm
-      ./ci/run TESTFLAGS=-v
+      ./ci/run
       # Also run all tests as root
       sudo chown -Rh root:wheel .
-      sudo ./ci/run TESTFLAGS=-v
+      sudo ./ci/run
diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml
index 05bb9a7..7f1d40c 100644
--- a/.builds/openbsd.yml
+++ b/.builds/openbsd.yml
@@ -14,8 +14,8 @@ tasks:
       doas ln -sf /usr/local/bin/gmake /usr/bin/make
       cd safcm
       # Go does not yet support -race on OpenBSD
-      ./ci/run GOFLAGS= TESTFLAGS=-v
+      ./ci/run GOFLAGS=
       # Also run all tests as root (-R and -h conflict on OpenBSD)
       doas chown -R root:wheel .
       # Remove $HOME hack once Go 1.16 is available
-      doas /bin/sh -c "HOME=$HOME ./ci/run GOFLAGS= TESTFLAGS=-v"
+      doas /bin/sh -c "HOME=$HOME ./ci/run GOFLAGS="
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ffbdf3..10f9811 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@
     - ln -sf /usr/lib/go-1.16/bin/go $HOME/go/bin
     - ln -sf /usr/lib/go-1.16/bin/gofmt $HOME/go/bin
     #
-    - ./ci/run TESTFLAGS=-v
+    - ./ci/run
 
 debian-sid:
   <<: *template-docker
diff --git a/Makefile b/Makefile
index c756989..f4cc011 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ safcm:
 
 test:
 	go vet ./...
-	go test $(GOFLAGS) $(TESTFLAGS) ./...
+	go test $(GOFLAGS) ./...
 
 clean:
 	rm -rf remote/helpers/
-- 
2.43.2