Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make the router integration tests run as part of test-end-to-end #15778

Merged
merged 1 commit into from
Aug 15, 2017
Merged

make the router integration tests run as part of test-end-to-end #15778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,21 @@ all build:
#
# Example:
# make build-tests
build-tests: build-extended-test build-integration-test
build-tests: build-extended-test build-integration-test build-router-e2e-test
.PHONY: build-tests

build-extended-test:
hack/build-go.sh test/extended/extended.test
.PHONY: build-extended-test

build-integration-test:
build-integration-test: build-router-e2e-test
hack/build-go.sh test/integration/integration.test
.PHONY: build-integration-test

build-router-e2e-test:
hack/build-go.sh test/end-to-end/end-to-end.test
.PHONY: build-router-e2e-test

# Run core verification and all self contained tests.
#
# Example:
Expand Down Expand Up @@ -187,6 +191,7 @@ test-cmd: build
# Example:
# make test-end-to-end
test-end-to-end: build
KUBE_COVER=" " KUBE_RACE=" " OS_TEST_PACKAGE=test/end-to-end hack/test-integration.sh
hack/test-end-to-end.sh
.PHONY: test-end-to-end

Expand Down
2 changes: 1 addition & 1 deletion test/integration/router_test.go → test/end-to-end/router_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package integration
package endtoend

import (
"crypto/tls"
Expand Down