fixup tests: remove test-shlib and rename the tests

kubernetes · Aug 30, 2017 · 1f13de0 · 1f13de0
1 parent 96d05b0
commit 1f13de0
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 112 deletions.
diff --git a/cluster/BUILD b/cluster/BUILD
@@ -47,32 +47,30 @@ pkg_tar(
     ],
 )
 
+# These tests just verify that bash can interpret the file.
 sh_test(
-    name = "common",
-    srcs = ["common_test.sh"],
+    name = "common_test",
+    srcs = ["common.sh"],
     data = [
-        "all-srcs",
+        ":all-srcs",
         "//hack/lib:all-srcs",
     ],
-    deps = ["//hack:test-shlib"],
 )
 
 sh_test(
-    name = "clientbin",
-    srcs = ["clientbin_test.sh"],
+    name = "clientbin_test",
+    srcs = ["clientbin.sh"],
     data = [
-        "all-srcs",
+        ":all-srcs",
         "//hack/lib:all-srcs",
     ],
-    deps = ["//hack:test-shlib"],
 )
 
 sh_test(
-    name = "kube-util",
-    srcs = ["kube-util_test.sh"],
+    name = "kube-util_test",
+    srcs = ["kube-util.sh"],
     data = [
-        "all-srcs",
+        ":all-srcs",
         "//hack/lib:all-srcs",
     ],
-    deps = ["//hack:test-shlib"],
 )
diff --git a/cluster/clientbin.sh b/cluster/clientbin.sh
diff --git a/cluster/clientbin_test.sh b/cluster/clientbin_test.sh
diff --git a/cluster/common_test.sh b/cluster/common_test.sh
diff --git a/cluster/kube-util.sh b/cluster/kube-util.sh
diff --git a/cluster/kube-util_test.sh b/cluster/kube-util_test.sh
diff --git a/hack/BUILD b/hack/BUILD
@@ -14,11 +14,6 @@ filegroup(
     visibility = ["//visibility:private"],
 )
 
-sh_library(
-    name = "test-shlib",
-    srcs = ["test-shlib.sh"],
-)
-
 filegroup(
     name = "all-srcs",
     srcs = [

diff --git a/hack/test-shlib.sh b/hack/test-shlib.sh