Enable E2E test running on Travis CI

- We want Travis build to fail if E2E tests fail. - Renamed "perf-test" makefile target to "e2e-test" (since these are not just perf tests but also other types of end-to-end tests). Issue: open-telemetry#68
tigrannajaryan · Jun 28, 2019 · 0e064d4 · 0e064d4
1 parent f28c6b8
commit 0e064d4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -35,16 +35,17 @@ all-srcs:
 .PHONY: fmt-vet-lint-test
 fmt-vet-lint-test: fmt vet lint test
 
-.PHONY: perf-test
-perf-test: otelsvc
+.PHONY: e2e-test
+e2e-test: otelsvc
 	$(MAKE) -C testbed runtests
 
 .PHONY: test
 test:
 	$(GOTEST) $(GOTEST_OPT) $(ALL_PKGS)
 
 .PHONY: travis-ci
-travis-ci: fmt vet lint test-with-cover
+travis-ci: fmt vet lint test-with-cover otelsvc
+	$(MAKE) -C testbed runtests
 
 .PHONY: test-with-cover
 test-with-cover:

diff --git a/testbed/testbed/.gitignore b/testbed/testbed/.gitignore
@@ -0,0 +1 @@
+mockbackend.log
diff --git a/testbed/tests/.gitignore b/testbed/tests/.gitignore
@@ -0,0 +1 @@
+results/*