From 33a1c4722aa4078bd713cd9eda8b8997ed7cb378 Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Thu, 18 Feb 2021 08:33:42 +0100
Subject: [PATCH] .builds: don't set EGL_PLATFORM for chrome tests

EGL_PLATFORM=surfaceless allows rendering tests to complete in headless
mode. However, the headless chrome tests fail with that setting. Change
the linux builder to only set the variable when needed.

Enable verbose output of tests while here. We can keep an eye on skipped
tests that way.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
---
 .builds/freebsd.yml |  4 ++--
 .builds/linux.yml   | 12 ++++++------
 .builds/openbsd.yml |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 7e5e4387..45abdd2e 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -18,7 +18,7 @@ tasks:
      curl https://dl.google.com/go/go1.14.freebsd-amd64.tar.gz | tar -C /home/build/sdk -xzf -
  - test_gio: |
      cd gio
-     go test ./...
+     go test -v ./...
  - test_cmd: |
      cd gio/cmd
-     go test ./...
+     go test -v ./...
diff --git a/.builds/linux.yml b/.builds/linux.yml
index 46c79cbc..5e89ae1c 100644
--- a/.builds/linux.yml
+++ b/.builds/linux.yml
@@ -30,7 +30,6 @@ environment:
  GOFLAGS: -mod=readonly
  PATH: /home/build/sdk/go/bin:/usr/bin:/home/build/go/bin:/home/build/android/tools/bin
  ANDROID_SDK_ROOT: /home/build/android
- EGL_PLATFORM: surfaceless # for headless tests
  android_sdk_tools_zip: sdk-tools-linux-3859397.zip
  android_ndk_zip: android-ndk-r20-linux-x86_64.zip
  github_mirror: git@github.com:gioui/gio
@@ -42,8 +41,9 @@ tasks:
      curl https://dl.google.com/go/go1.14.linux-amd64.tar.gz | tar -C /home/build/sdk -xzf -
  - test_gio: |
      cd gio
-     go test -race ./...
-     GOOS=windows go test -exec=wine ./...
+     export EGL_PLATFORM=surfaceless # for headless tests
+     go test -race -v ./...
+     GOOS=windows go test -exec=wine -v ./...
      GOOS=js GOARCH=wasm go build -o /dev/null ./...
  - install_chrome: |
      curl -s https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
@@ -52,10 +52,10 @@ tasks:
      sudo apt install -y google-chrome-stable
  - test_cmd: |
      cd gio/cmd
-     go test ./...
-     go test -race ./...
+     go test -v ./...
+     go test -race -v ./...
      cd gogio # since we need -modfile to point at the parent directory
-     GOFLAGS=-modfile=../go.local.mod go test
+     GOFLAGS=-modfile=../go.local.mod go test -v
  - install_jdk8: |
      curl -so jdk.deb "https://cdn.azul.com/zulu/bin/zulu8.42.0.21-ca-jdk8.0.232-linux_amd64.deb"
      sudo apt install -y -f ./jdk.deb
diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml
index 757e80f0..7ebf020d 100644
--- a/.builds/openbsd.yml
+++ b/.builds/openbsd.yml
@@ -15,7 +15,7 @@ tasks:
      ./make.bash
  - test_gio: |
      cd gio
-     go test ./...
+     go test -v ./...
  - test_cmd: |
      cd gio/cmd
-     go test ./...
+     go test -v ./...