From 1998cf7e772b5e3e1b3c21cb65092551d46e75ac Mon Sep 17 00:00:00 2001
From: Sam Kleinman <garen@tychoish.com>
Date: Fri, 10 Sep 2021 13:34:26 -0400
Subject: [PATCH] e2e: compile tests (#6926)

---
 .github/workflows/e2e-nightly-master.yml | 2 +-
 .github/workflows/e2e.yml                | 2 +-
 test/e2e/Makefile                        | 7 +++++--
 test/e2e/run-multiple.sh                 | 2 +-
 test/e2e/runner/main.go                  | 3 +--
 test/e2e/runner/test.go                  | 2 +-
 test/e2e/tests/e2e_test.go               | 4 ----
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/e2e-nightly-master.yml b/.github/workflows/e2e-nightly-master.yml
index d6d459abc..029fee6bb 100644
--- a/.github/workflows/e2e-nightly-master.yml
+++ b/.github/workflows/e2e-nightly-master.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Build
         working-directory: test/e2e
         # Run make jobs in parallel, since we can't run steps in parallel.
-        run: make -j2 docker generator runner
+        run: make -j2 docker generator runner tests
 
       - name: Generate testnets
         working-directory: test/e2e
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index dd2b44da3..5cc605ead 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Build
         working-directory: test/e2e
         # Run two make jobs in parallel, since we can't run steps in parallel.
-        run: make -j2 docker runner
+        run: make -j2 docker runner tests
         if: "env.GIT_DIFF != ''"
 
       - name: Run CI testnet
diff --git a/test/e2e/Makefile b/test/e2e/Makefile
index 38ce809e6..2b41cc1cd 100644
--- a/test/e2e/Makefile
+++ b/test/e2e/Makefile
@@ -1,4 +1,4 @@
-all: docker generator runner
+all: docker generator runner tests
 
 docker:
 	docker build --tag tendermint/e2e-node -f docker/Dockerfile ../..
@@ -15,4 +15,7 @@ generator:
 runner:
 	go build -o build/runner ./runner
 
-.PHONY: all app docker generator runner 
+tests:
+	go test -o build/tests ./tests
+
+.PHONY: all app docker generator runner tests
diff --git a/test/e2e/run-multiple.sh b/test/e2e/run-multiple.sh
index 5d6a20ef9..571a78a7f 100755
--- a/test/e2e/run-multiple.sh
+++ b/test/e2e/run-multiple.sh
@@ -19,7 +19,7 @@ FAILED=()
 
 for MANIFEST in "$@"; do
 	START=$SECONDS
-	echo "==> Running testnet $MANIFEST..."
+	echo "==> Running testnet: $MANIFEST"
 
 	if ! ./build/runner -f "$MANIFEST"; then
 		echo "==> Testnet $MANIFEST failed, dumping manifest..."
diff --git a/test/e2e/runner/main.go b/test/e2e/runner/main.go
index 105e33da0..f65b6d0b1 100644
--- a/test/e2e/runner/main.go
+++ b/test/e2e/runner/main.go
@@ -63,8 +63,7 @@ func NewCLI() *CLI {
 			lctx, loadCancel := context.WithCancel(ctx)
 			defer loadCancel()
 			go func() {
-				err := Load(lctx, cli.testnet)
-				chLoadResult <- err
+				chLoadResult <- Load(lctx, cli.testnet)
 			}()
 
 			if err := Start(ctx, cli.testnet); err != nil {
diff --git a/test/e2e/runner/test.go b/test/e2e/runner/test.go
index 834ce6f2d..ac24b0cd2 100644
--- a/test/e2e/runner/test.go
+++ b/test/e2e/runner/test.go
@@ -15,5 +15,5 @@ func Test(testnet *e2e.Testnet) error {
 		return err
 	}
 
-	return execVerbose("go", "test", "-count", "1", "./tests/...")
+	return execVerbose("./build/tests", "-test.count", "1")
 }
diff --git a/test/e2e/tests/e2e_test.go b/test/e2e/tests/e2e_test.go
index 79bd26bd7..acc3ac78a 100644
--- a/test/e2e/tests/e2e_test.go
+++ b/test/e2e/tests/e2e_test.go
@@ -3,7 +3,6 @@ package e2e_test
 import (
 	"context"
 	"os"
-	"path/filepath"
 	"sync"
 	"testing"
 
@@ -72,9 +71,6 @@ func loadTestnet(t *testing.T) e2e.Testnet {
 	if manifest == "" {
 		t.Skip("E2E_MANIFEST not set, not an end-to-end test run")
 	}
-	if !filepath.IsAbs(manifest) {
-		manifest = filepath.Join("..", manifest)
-	}
 
 	testnetCacheMtx.Lock()
 	defer testnetCacheMtx.Unlock()