Skip to content

Commit

Permalink
Merge pull request #3922 from justinsb/bazel_fix_tests
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

bazel: fix tests/ directory
  • Loading branch information
Kubernetes Submit Queue authored Nov 26, 2017
2 parents 875b416 + b9ced19 commit 36abd6f
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ kops-server-push: kops-server-build

.PHONY: bazel-test
bazel-test:
bazel ${BAZEL_OPTIONS} test //cmd/... //pkg/... //channels/... //nodeup/... //channels/... //protokube/... //dns-controller/... //upup/... //util/... //hack:verify-all --test_output=errors
bazel ${BAZEL_OPTIONS} test //cmd/... //pkg/... //channels/... //nodeup/... //channels/... //protokube/... //dns-controller/... //tests/... //upup/... //util/... //hack:verify-all --test_output=errors

.PHONY: bazel-build
bazel-build:
Expand Down
10 changes: 10 additions & 0 deletions tests/integration/channel/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
go_test(
name = "go_default_test",
srcs = ["integration_test.go"],
data = [
"exported_testdata", # keep
"//channels:channeldata", # keep
],
importpath = "k8s.io/kops/tests/integration/channel",
deps = [
"//pkg/apis/kops:go_default_library",
"//vendor/github.com/blang/semver:go_default_library",
],
)

filegroup(
name = "exported_testdata",
srcs = glob(["simple/**"]),
visibility = ["//visibility:public"],
)
9 changes: 9 additions & 0 deletions tests/integration/conversion/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
go_test(
name = "go_default_test",
srcs = ["integration_test.go"],
data = [
"exported_testdata", # keep
],
importpath = "k8s.io/kops/tests/integration/conversion",
deps = [
"//pkg/apis/kops:go_default_library",
Expand All @@ -14,3 +17,9 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
],
)

filegroup(
name = "exported_testdata",
srcs = glob(["minimal/**"]),
visibility = ["//visibility:public"],
)

0 comments on commit 36abd6f

Please sign in to comment.