gogio: implement custom rendering test

This commit adds an end to end test for the custom rendering
use-case. I confirmed that the new test failed when custom
rendering frame lifecycle was broken, and succeeds now.

However, the old X11 tests started failing when the new
one started passing. I'm not sure how they interfere with
one another, but I'm out of time to investigate.

Signed-off-by: Chris Waldon <christopher.waldon.dev@gmail.com>

gogio/e2e_test.go

@@ -13,6 +13,7 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -69,27 +70,33 @@ func TestEndToEnd(t *testing.T) {
 	t.Parallel()
 
 	const (
-		testdataWithGoImportPkgPath = "gioui.org/cmd/gogio/testdata"
-		testdataWithRelativePkgPath = "testdata/testdata.go"
+		testdataWithGoImportPkgPath             = "gioui.org/cmd/gogio/internal/normal"
+		testdataWithRelativePkgPath             = "internal/normal/testdata.go"
+		customRenderTestdataWithRelativePkgPath = "internal/custom/testdata.go"
 	)
 	// Keep this list local, to not reuse TestDriver objects.
 	subtests := []struct {
-		name    string
-		driver  TestDriver
-		pkgPath string
+		name      string
+		driver    TestDriver
+		pkgPath   string
+		skipGeese string
 	}{
-		{"X11 using go import path", &X11TestDriver{}, testdataWithGoImportPkgPath},
-		{"X11", &X11TestDriver{}, testdataWithRelativePkgPath},
+		{"X11 using go import path", &X11TestDriver{}, testdataWithGoImportPkgPath, ""},
+		{"X11", &X11TestDriver{}, testdataWithRelativePkgPath, ""},
+		{"X11 with custom rendering", &X11TestDriver{}, customRenderTestdataWithRelativePkgPath, "openbsd"},
 		// Doesn't work on the builders.
 		//{"Wayland", &WaylandTestDriver{}, testdataWithRelativePkgPath},
-		{"JS", &JSTestDriver{}, testdataWithRelativePkgPath},
-		{"Android", &AndroidTestDriver{}, testdataWithRelativePkgPath},
-		{"Windows", &WineTestDriver{}, testdataWithRelativePkgPath},
+		{"JS", &JSTestDriver{}, testdataWithRelativePkgPath, ""},
+		{"Android", &AndroidTestDriver{}, testdataWithRelativePkgPath, ""},
+		{"Windows", &WineTestDriver{}, testdataWithRelativePkgPath, ""},
 	}
 
 	for _, subtest := range subtests {
 		t.Run(subtest.name, func(t *testing.T) {
 			subtest := subtest // copy the changing loop variable
+			if strings.Contains(subtest.skipGeese, runtime.GOOS) {
+				t.Skipf("not supported on %s", runtime.GOOS)
+			}
 			t.Parallel()
 			runEndToEndTest(t, subtest.driver, subtest.pkgPath)
 		})