Merge pull request kubernetes#279 from thockin/master

Clean up make / make test / make verify

Author: k8s-ci-robot

Makefile

@@ -1,17 +1,16 @@
 all:
 	go build ./...
-	go -C v2 build ./...
+	make -C v2 all
 
 test:
 	go test -race ./...
-	go -C v2 test -race ./...
-	(cd v2 && ./hack/verify-examples.sh)
+	go -C ./examples/defaulter-gen/output_tests test ./...
+	make -C v2 test
 
 # We verify for the maximum version of the go directive as 1.20
 # here because the oldest go directive that exists on our supported
 # release branches in k/k is 1.20.
 verify:
 	./hack/verify-examples.sh
 	./hack/verify-go-directive.sh 1.20
-	./v2/hack/verify-examples.sh
-	cd v2 && ../hack/verify-go-directive.sh 1.20
+	make -C v2 verify

examples/defaulter-gen/_output_tests/empty/doc.go renamed to examples/defaulter-gen/output_tests/empty/doc.go

@@ -1,6 +1,3 @@
-// Ignore this file to prevent zz_generated for this package
-//go:build !ignore_autogenerated
-
 //go:generate go run k8s.io/gengo/examples/defaulter-gen -i k8s.io/gengo/examples/defaulter-gen/output_tests/... -O zz_generated --go-header-file=../../../boilerplate/boilerplate.go.txt -o . --trim-path-prefix=k8s.io/gengo/examples/defaulter-gen/output_tests
 package output_tests_test
 

examples/defaulter-gen/_output_tests/empty/type.go renamed to examples/defaulter-gen/output_tests/empty/type.go

@@ -1,5 +1,3 @@
-// Package must be named output_tests rather than _output tests to avoid
-// ambiguous import conflict with main gengo package
 module k8s.io/gengo/examples/defaulter-gen/output_tests
 
 go 1.20