Move tests

bazelbuild · Oct 8, 2024 · 18a4632 · 18a4632
1 parent 84877ef
commit 18a4632
Show file tree

Hide file tree

Showing 68 changed files with 57 additions and 58 deletions.
diff --git a/...test_cc_shared_library/BUILD.builtin_test → ...cc_shared_library/test/BUILD.builtin_test b/...test_cc_shared_library/BUILD.builtin_test → ...cc_shared_library/test/BUILD.builtin_test
@@ -26,7 +26,7 @@ NO_BUILD_TAGS = [
 licenses(["notice"])
 
 package(
-    default_visibility = ["//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library:__subpackages__"],
+    default_visibility = ["//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:__subpackages__"],
 )
 
 py_test(
@@ -119,7 +119,7 @@ cc_shared_library(
     }),
     dynamic_deps = [
         "bar_so",
-        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library3:diff_pkg_so",
+        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test3:diff_pkg_so",
         "private_lib_so",
     ],
     exports_filter = [
@@ -176,7 +176,7 @@ cc_library(
         # Not exported.
         "qux",
         "prebuilt",
-        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library3:diff_pkg",
+        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test3:diff_pkg",
     ],
 )
 
@@ -275,7 +275,7 @@ cc_shared_library(
     }),
     exports_filter = [
         "bar3",  # Exported transitive dependency
-        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library3:bar",
+        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test3:bar",
     ],
     features = ["windows_export_all_symbols"],
     user_link_flags = select({
@@ -330,7 +330,7 @@ cc_library(
     srcs = ["bar3.cc"],
     hdrs = ["bar3.h"],
     deps = [
-        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library3:bar",
+        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test3:bar",
     ],
 )
 
@@ -371,17 +371,17 @@ additional_inputs_test(
 build_failure_test(
     name = "link_once_repeated_test_binary",
     messages = [
-        "cc_shared_library/test_cc_shared_library:barX\",",
+        "cc_shared_library/test:barX\",",
     ],
-    target = "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/failing_targets:should_fail_binary",
+    target = "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/failing_targets:should_fail_binary",
 )
 
 build_failure_test(
     name = "link_once_repeated_test_shared_lib",
     messages = [
-        "cc_shared_library/test_cc_shared_library:barX\",",
+        "cc_shared_library/test:barX\",",
     ],
-    target = "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/failing_targets:should_fail_shared_lib",
+    target = "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/failing_targets:should_fail_shared_lib",
 )
 
 paths_test(
@@ -498,13 +498,13 @@ cc_shared_library(
 build_failure_test(
     name = "two_dynamic_deps_same_export_in_so_test",
     message = "Two shared libraries in dependencies export the same symbols",
-    target = "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/failing_targets:two_dynamic_deps_same_export_in_so",
+    target = "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/failing_targets:two_dynamic_deps_same_export_in_so",
 )
 
 build_failure_test(
     name = "two_dynamic_deps_same_export_in_binary_test",
     message = "Two shared libraries in dependencies link the same  library statically",
-    target = "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/failing_targets:two_dynamic_deps_same_export_in_binary",
+    target = "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/failing_targets:two_dynamic_deps_same_export_in_binary",
 )
 
 interface_library_output_group_test(
@@ -535,26 +535,26 @@ check_linking_action_lib_parameters_test(
 build_failure_test(
     name = "shared_library_without_deps",
     message = "'cc_shared_library' must have at least one dependency in 'deps' (or 'roots')",
-    target = "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/failing_targets:failing_with_no_deps_so",
+    target = "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/failing_targets:failing_with_no_deps_so",
 )
 
 build_failure_test(
     name = "direct_dep_with_only_shared_lib_file",
     message = "Do not place libraries which only contain a precompiled dynamic library",
-    target = "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/failing_targets:failing_only_dynamic_lib",
+    target = "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/failing_targets:failing_only_dynamic_lib",
 )
 
 exports_test(
     name = "exports_foo_test",
     target = ":foo_so",
     targets_that_should_be_claimed_to_be_exported = [
-        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library:indirect_dep2",
-        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library:baz",
-        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library:foo",
-        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library:cc_lib_with_no_srcs",
-        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library:nocode_cc_lib",
-        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library:should_not_be_linked_cc_lib",
-        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library:a_suffix",
+        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:indirect_dep2",
+        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:baz",
+        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:foo",
+        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:cc_lib_with_no_srcs",
+        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:nocode_cc_lib",
+        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:should_not_be_linked_cc_lib",
+        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:a_suffix",
     ],
 )
 
@@ -564,7 +564,7 @@ exports_test(
     target = "external_export_so",
     targets_that_should_be_claimed_to_be_exported = [
         "@@test_repo+//:bar",
-        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library:external_export",
+        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:external_export",
     ],
 )
 

diff --git a/...ibrary/test_cc_shared_library/a_suffix.cc → ...bzl/cc/cc_shared_library/test/a_suffix.cc b/...ibrary/test_cc_shared_library/a_suffix.cc → ...bzl/cc/cc_shared_library/test/a_suffix.cc
@@ -11,6 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/a_suffix.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/a_suffix.h"
 
 int a_suffix() { return 42; }
diff --git a/...library/test_cc_shared_library/a_suffix.h → ..._bzl/cc/cc_shared_library/test/a_suffix.h b/...library/test_cc_shared_library/a_suffix.h → ..._bzl/cc/cc_shared_library/test/a_suffix.h
diff --git a/...t_cc_shared_library/additional_script.txt → ...shared_library/test/additional_script.txt b/...t_cc_shared_library/additional_script.txt → ...shared_library/test/additional_script.txt
diff --git a/...red_library/test_cc_shared_library/bar.cc → ...tins_bzl/cc/cc_shared_library/test/bar.cc b/...red_library/test_cc_shared_library/bar.cc → ...tins_bzl/cc/cc_shared_library/test/bar.cc
@@ -11,6 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/bar.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/bar.h"
 
 int bar() { return 42; }
diff --git a/...ared_library/test_cc_shared_library/bar.h → ...ltins_bzl/cc/cc_shared_library/test/bar.h b/...ared_library/test_cc_shared_library/bar.h → ...ltins_bzl/cc/cc_shared_library/test/bar.h
diff --git a/...ed_library/test_cc_shared_library/bar.lds → ...ins_bzl/cc/cc_shared_library/test/bar.lds b/...ed_library/test_cc_shared_library/bar.lds → ...ins_bzl/cc/cc_shared_library/test/bar.lds
diff --git a/...ed_library/test_cc_shared_library/bar2.cc → ...ins_bzl/cc/cc_shared_library/test/bar2.cc b/...ed_library/test_cc_shared_library/bar2.cc → ...ins_bzl/cc/cc_shared_library/test/bar2.cc
@@ -11,6 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/bar2.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/bar2.h"
 
 int bar2() { return 42; }
diff --git a/...red_library/test_cc_shared_library/bar2.h → ...tins_bzl/cc/cc_shared_library/test/bar2.h b/...red_library/test_cc_shared_library/bar2.h → ...tins_bzl/cc/cc_shared_library/test/bar2.h
diff --git a/...ed_library/test_cc_shared_library/bar3.cc → ...ins_bzl/cc/cc_shared_library/test/bar3.cc b/...ed_library/test_cc_shared_library/bar3.cc → ...ins_bzl/cc/cc_shared_library/test/bar3.cc
@@ -11,6 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/bar3.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/bar3.h"
 
 int bar3() { return 42; }
diff --git a/...red_library/test_cc_shared_library/bar3.h → ...tins_bzl/cc/cc_shared_library/test/bar3.h b/...red_library/test_cc_shared_library/bar3.h → ...tins_bzl/cc/cc_shared_library/test/bar3.h
diff --git a/...ed_library/test_cc_shared_library/barX.cc → ...ins_bzl/cc/cc_shared_library/test/barX.cc b/...ed_library/test_cc_shared_library/barX.cc → ...ins_bzl/cc/cc_shared_library/test/barX.cc
@@ -11,6 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/barX.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/barX.h"
 
 int barX() { return 42; }
diff --git a/...red_library/test_cc_shared_library/barX.h → ...tins_bzl/cc/cc_shared_library/test/barX.h b/...red_library/test_cc_shared_library/barX.h → ...tins_bzl/cc/cc_shared_library/test/barX.h
diff --git a/...red_library/test_cc_shared_library/baz.cc → ...tins_bzl/cc/cc_shared_library/test/baz.cc b/...red_library/test_cc_shared_library/baz.cc → ...tins_bzl/cc/cc_shared_library/test/baz.cc
@@ -11,6 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/baz.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/baz.h"
 
 int baz() { return 42; }
diff --git a/...ared_library/test_cc_shared_library/baz.h → ...ltins_bzl/cc/cc_shared_library/test/baz.h b/...ared_library/test_cc_shared_library/baz.h → ...ltins_bzl/cc/cc_shared_library/test/baz.h
diff --git a/...ary/cc_shared_library_integration_test.sh → ...est/cc_shared_library_integration_test.sh b/...ary/cc_shared_library_integration_test.sh → ...est/cc_shared_library_integration_test.sh
diff --git a/...c_shared_library/direct_so_file_cc_lib.cc → ...red_library/test/direct_so_file_cc_lib.cc b/...c_shared_library/direct_so_file_cc_lib.cc → ...red_library/test/direct_so_file_cc_lib.cc
@@ -12,5 +12,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/direct_so_file_cc_lib.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/direct_so_file_cc_lib.h"
 int direct_so_file_cc_lib() { return 0; }
diff --git a/...cc_shared_library/direct_so_file_cc_lib.h → ...ared_library/test/direct_so_file_cc_lib.h b/...cc_shared_library/direct_so_file_cc_lib.h → ...ared_library/test/direct_so_file_cc_lib.h
diff --git a/..._shared_library/direct_so_file_cc_lib2.cc → ...ed_library/test/direct_so_file_cc_lib2.cc b/..._shared_library/direct_so_file_cc_lib2.cc → ...ed_library/test/direct_so_file_cc_lib2.cc
@@ -12,5 +12,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/direct_so_file_cc_lib2.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/direct_so_file_cc_lib2.h"
 int direct_so_file_cc_lib2() { return 0; }
diff --git a/...c_shared_library/direct_so_file_cc_lib2.h → ...red_library/test/direct_so_file_cc_lib2.h b/...c_shared_library/direct_so_file_cc_lib2.h → ...red_library/test/direct_so_file_cc_lib2.h
diff --git a/...ibrary/failing_targets/BUILD.builtin_test → ...y/test/failing_targets/BUILD.builtin_test b/...ibrary/failing_targets/BUILD.builtin_test → ...y/test/failing_targets/BUILD.builtin_test
@@ -9,16 +9,16 @@ TAGS = [
 
 cc_binary(
     name = "should_fail_binary",
-    dynamic_deps = ["//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library:bar_so"],
+    dynamic_deps = ["//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:bar_so"],
     tags = TAGS,
     deps = [
-        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library:barX",
+        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:barX",
     ],
 )
 
 cc_shared_library(
     name = "should_fail_shared_lib",
-    dynamic_deps = ["//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library:bar_so"],
+    dynamic_deps = ["//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:bar_so"],
     deps = [
         ":intermediate",
     ],
@@ -28,7 +28,7 @@ cc_shared_library(
 cc_library(
     name = "intermediate",
     deps = [
-        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library:barX",
+        "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test:barX",
     ],
 )
 
@@ -112,4 +112,3 @@ genrule(
     outs = ["libabc.so"],
     cmd = "touch \"$@\"",
 )
-
diff --git a/...st_cc_shared_library/failing_targets/a.cc → ..._shared_library/test/failing_targets/a.cc b/...st_cc_shared_library/failing_targets/a.cc → ..._shared_library/test/failing_targets/a.cc
diff --git a/...st_cc_shared_library/failing_targets/b.cc → ..._shared_library/test/failing_targets/b.cc b/...st_cc_shared_library/failing_targets/b.cc → ..._shared_library/test/failing_targets/b.cc
diff --git a/...st_cc_shared_library/failing_targets/c.cc → ..._shared_library/test/failing_targets/c.cc b/...st_cc_shared_library/failing_targets/c.cc → ..._shared_library/test/failing_targets/c.cc
diff --git a/...c_shared_library/failing_targets/empty.cc → ...red_library/test/failing_targets/empty.cc b/...c_shared_library/failing_targets/empty.cc → ...red_library/test/failing_targets/empty.cc
diff --git a/...cc_shared_library/failing_targets/main.cc → ...ared_library/test/failing_targets/main.cc b/...cc_shared_library/failing_targets/main.cc → ...ared_library/test/failing_targets/main.cc
diff --git a/...red_library/test_cc_shared_library/foo.cc → ...tins_bzl/cc/cc_shared_library/test/foo.cc b/...red_library/test_cc_shared_library/foo.cc → ...tins_bzl/cc/cc_shared_library/test/foo.cc
@@ -11,12 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/bar.h"
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/baz.h"
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/direct_so_file_cc_lib.h"
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/direct_so_file_cc_lib2.h"
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/qux.h"
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library3/diff_pkg.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/bar.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/baz.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/direct_so_file_cc_lib.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/direct_so_file_cc_lib2.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/qux.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test3/diff_pkg.h"
 
 int foo() {
   diff_pkg();

diff --git a/...ared_library/test_cc_shared_library/foo.h → ...ltins_bzl/cc/cc_shared_library/test/foo.h b/...ared_library/test_cc_shared_library/foo.h → ...ltins_bzl/cc/cc_shared_library/test/foo.h
diff --git a/...ed_library/test_cc_shared_library/foo.lds → ...ins_bzl/cc/cc_shared_library/test/foo.lds b/...ed_library/test_cc_shared_library/foo.lds → ...ins_bzl/cc/cc_shared_library/test/foo.lds
diff --git a/...ry/test_cc_shared_library/indirect_dep.cc → ...cc/cc_shared_library/test/indirect_dep.cc b/...ry/test_cc_shared_library/indirect_dep.cc → ...cc/cc_shared_library/test/indirect_dep.cc
diff --git a/...y/test_cc_shared_library/indirect_dep2.cc → ...c/cc_shared_library/test/indirect_dep2.cc b/...y/test_cc_shared_library/indirect_dep2.cc → ...c/cc_shared_library/test/indirect_dep2.cc
diff --git a/...y/test_cc_shared_library/indirect_dep3.cc → ...c/cc_shared_library/test/indirect_dep3.cc b/...y/test_cc_shared_library/indirect_dep3.cc → ...c/cc_shared_library/test/indirect_dep3.cc
diff --git a/...hared_library/test_cc_shared_library/l.cc → ...iltins_bzl/cc/cc_shared_library/test/l.cc b/...hared_library/test_cc_shared_library/l.cc → ...iltins_bzl/cc/cc_shared_library/test/l.cc
diff --git a/...ed_library/test_cc_shared_library/main.cc → ...ins_bzl/cc/cc_shared_library/test/main.cc b/...ed_library/test_cc_shared_library/main.cc → ...ins_bzl/cc/cc_shared_library/test/main.cc
@@ -13,7 +13,7 @@
 // limitations under the License.
 #include <iostream>
 
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/foo.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/foo.h"
 
 int main() {
   std::cout << "hello " << foo() << std::endl;

diff --git a/...test_cc_shared_library/not_depended_on.cc → ...cc_shared_library/test/not_depended_on.cc b/...test_cc_shared_library/not_depended_on.cc → ...cc_shared_library/test/not_depended_on.cc
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/bar.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/bar.h"
 
 int foo() {
   bar();

diff --git a/...ary/test_cc_shared_library/python_test.py → .../cc/cc_shared_library/test/python_test.py b/...ary/test_cc_shared_library/python_test.py → .../cc/cc_shared_library/test/python_test.py
diff --git a/...ed_library/test_cc_shared_library/quux.cc → ...ins_bzl/cc/cc_shared_library/test/quux.cc b/...ed_library/test_cc_shared_library/quux.cc → ...ins_bzl/cc/cc_shared_library/test/quux.cc
diff --git a/...red_library/test_cc_shared_library/qux.cc → ...tins_bzl/cc/cc_shared_library/test/qux.cc b/...red_library/test_cc_shared_library/qux.cc → ...tins_bzl/cc/cc_shared_library/test/qux.cc
@@ -11,6 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/qux.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/qux.h"
 
 int qux() { return 42; }
diff --git a/...ared_library/test_cc_shared_library/qux.h → ...ltins_bzl/cc/cc_shared_library/test/qux.h b/...ared_library/test_cc_shared_library/qux.h → ...ltins_bzl/cc/cc_shared_library/test/qux.h
diff --git a/...ed_library/test_cc_shared_library/qux2.cc → ...ins_bzl/cc/cc_shared_library/test/qux2.cc b/...ed_library/test_cc_shared_library/qux2.cc → ...ins_bzl/cc/cc_shared_library/test/qux2.cc
@@ -11,6 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/qux2.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/qux2.h"
 
 int qux2() { return 42; }
diff --git a/...red_library/test_cc_shared_library/qux2.h → ...tins_bzl/cc/cc_shared_library/test/qux2.h b/...red_library/test_cc_shared_library/qux2.h → ...tins_bzl/cc/cc_shared_library/test/qux2.h
diff --git a/...test_cc_shared_library/starlark_tests.bzl → ...cc_shared_library/test/starlark_tests.bzl b/...test_cc_shared_library/starlark_tests.bzl → ...cc_shared_library/test/starlark_tests.bzl
@@ -107,7 +107,7 @@ def _additional_inputs_test_impl(env, target):
         for arg in target_action.argv:
             if arg.find("-Wl,--script=") != -1:
                 env.expect.that_str(
-                    "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/additional_script.txt",
+                    "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/additional_script.txt",
                 ).equals(arg[13:])
                 found = True
                 break
@@ -190,8 +190,8 @@ def _runfiles_test_impl(env, target):
         if "python" not in file.path
     ]
 
-    # Match e.g. bazel-out/k8-fastbuild/bin/src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/libdirect_so_file.so
-    path_suffix = "/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library"
+    # Match e.g. bazel-out/k8-fastbuild/bin/src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test/libdirect_so_file.so
+    path_suffix = "/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test"
     env.expect.that_collection(runfiles).contains_exactly_predicates([
         matching.str_endswith(path_suffix + "/libfoo_so.so"),
         matching.str_endswith(path_suffix + "/libbar_so.so"),

diff --git a/...library/test_cc_shared_library/testenv.sh → ..._bzl/cc/cc_shared_library/test/testenv.sh b/...library/test_cc_shared_library/testenv.sh → ..._bzl/cc/cc_shared_library/test/testenv.sh
diff --git a/...est_cc_shared_library2/BUILD.builtin_test → ...c_shared_library/test2/BUILD.builtin_test b/...est_cc_shared_library2/BUILD.builtin_test → ...c_shared_library/test2/BUILD.builtin_test
diff --git a/...rary/test_cc_shared_library2/MODULE.bazel → ...l/cc/cc_shared_library/test2/MODULE.bazel b/...rary/test_cc_shared_library2/MODULE.bazel → ...l/cc/cc_shared_library/test2/MODULE.bazel
diff --git a/...library/test_cc_shared_library2/WORKSPACE → ..._bzl/cc/cc_shared_library/test2/WORKSPACE b/...library/test_cc_shared_library2/WORKSPACE → ..._bzl/cc/cc_shared_library/test2/WORKSPACE
diff --git a/...ed_library/test_cc_shared_library2/bar.cc → ...ins_bzl/cc/cc_shared_library/test2/bar.cc b/...ed_library/test_cc_shared_library2/bar.cc → ...ins_bzl/cc/cc_shared_library/test2/bar.cc
diff --git a/...red_library/test_cc_shared_library2/bar.h → ...tins_bzl/cc/cc_shared_library/test2/bar.h b/...red_library/test_cc_shared_library2/bar.h → ...tins_bzl/cc/cc_shared_library/test2/bar.h
diff --git a/...est_cc_shared_library3/BUILD.builtin_test → ...c_shared_library/test3/BUILD.builtin_test b/...est_cc_shared_library3/BUILD.builtin_test → ...c_shared_library/test3/BUILD.builtin_test
diff --git a/...ed_library/test_cc_shared_library3/bar.cc → ...ins_bzl/cc/cc_shared_library/test3/bar.cc b/...ed_library/test_cc_shared_library3/bar.cc → ...ins_bzl/cc/cc_shared_library/test3/bar.cc
diff --git a/...red_library/test_cc_shared_library3/bar.h → ...tins_bzl/cc/cc_shared_library/test3/bar.h b/...red_library/test_cc_shared_library3/bar.h → ...tins_bzl/cc/cc_shared_library/test3/bar.h
diff --git a/...brary/test_cc_shared_library3/diff_pkg.cc → ...zl/cc/cc_shared_library/test3/diff_pkg.cc b/...brary/test_cc_shared_library3/diff_pkg.cc → ...zl/cc/cc_shared_library/test3/diff_pkg.cc
@@ -11,6 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library3/diff_pkg.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test3/diff_pkg.h"
 
 int diff_pkg() { return 42; }
diff --git a/...ibrary/test_cc_shared_library3/diff_pkg.h → ...bzl/cc/cc_shared_library/test3/diff_pkg.h b/...ibrary/test_cc_shared_library3/diff_pkg.h → ...bzl/cc/cc_shared_library/test3/diff_pkg.h
diff --git a/...est_cc_shared_library4/BUILD.builtin_test → ...c_shared_library/test4/BUILD.builtin_test b/...est_cc_shared_library4/BUILD.builtin_test → ...c_shared_library/test4/BUILD.builtin_test
diff --git a/...ed_library/test_cc_shared_library4/bar.cc → ...ins_bzl/cc/cc_shared_library/test4/bar.cc b/...ed_library/test_cc_shared_library4/bar.cc → ...ins_bzl/cc/cc_shared_library/test4/bar.cc
@@ -11,6 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library4/bar.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test4/bar.h"
 
 int bar() { return 42; }
diff --git a/...red_library/test_cc_shared_library4/bar.h → ...tins_bzl/cc/cc_shared_library/test4/bar.h b/...red_library/test_cc_shared_library4/bar.h → ...tins_bzl/cc/cc_shared_library/test4/bar.h
diff --git a/...d_library/test_cc_shared_library4/main.cc → ...ns_bzl/cc/cc_shared_library/test4/main.cc b/...d_library/test_cc_shared_library4/main.cc → ...ns_bzl/cc/cc_shared_library/test4/main.cc
@@ -13,7 +13,7 @@
 // limitations under the License.
 #include <iostream>
 
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library4/bar.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test4/bar.h"
 
 int main() {
   std::cout << "hello " << bar() << std::endl;

diff --git a/...test_cc_static_library/BUILD.builtin_test → ...cc_static_library/test/BUILD.builtin_test b/...test_cc_static_library/BUILD.builtin_test → ...cc_static_library/test/BUILD.builtin_test
diff --git a/...tic_library/test_cc_static_library/bar.cc → ...tins_bzl/cc/cc_static_library/test/bar.cc b/...tic_library/test_cc_static_library/bar.cc → ...tins_bzl/cc/cc_static_library/test/bar.cc
@@ -11,9 +11,9 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_static_library/test_cc_static_library/bar.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_static_library/test/bar.h"
 
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_static_library/test_cc_static_library/foo.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_static_library/test/foo.h"
 
 int bar() { return 2 * foo(); }
 

diff --git a/...atic_library/test_cc_static_library/bar.h → ...ltins_bzl/cc/cc_static_library/test/bar.h b/...atic_library/test_cc_static_library/bar.h → ...ltins_bzl/cc/cc_static_library/test/bar.h
diff --git a/...ary/cc_static_library_integration_test.sh → ...est/cc_static_library_integration_test.sh b/...ary/cc_static_library_integration_test.sh → ...est/cc_static_library_integration_test.sh
diff --git a/...tic_library/test_cc_static_library/foo.cc → ...tins_bzl/cc/cc_static_library/test/foo.cc b/...tic_library/test_cc_static_library/foo.cc → ...tins_bzl/cc/cc_static_library/test/foo.cc
@@ -11,6 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_static_library/test_cc_static_library/foo.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_static_library/test/foo.h"
 
 int foo() { return 42; }
diff --git a/...atic_library/test_cc_static_library/foo.h → ...ltins_bzl/cc/cc_static_library/test/foo.h b/...atic_library/test_cc_static_library/foo.h → ...ltins_bzl/cc/cc_static_library/test/foo.h
diff --git a/...ibrary/test_cc_static_library/lib_only.cc → ...bzl/cc/cc_static_library/test/lib_only.cc b/...ibrary/test_cc_static_library/lib_only.cc → ...bzl/cc/cc_static_library/test/lib_only.cc
diff --git a/...test_cc_static_library/mock_toolchain.bzl → ...cc_static_library/test/mock_toolchain.bzl b/...test_cc_static_library/mock_toolchain.bzl → ...cc_static_library/test/mock_toolchain.bzl
diff --git a/...test_cc_static_library/starlark_tests.bzl → ...cc_static_library/test/starlark_tests.bzl b/...test_cc_static_library/starlark_tests.bzl → ...cc_static_library/test/starlark_tests.bzl
diff --git a/...ic_library/test_cc_static_library/test.cc → ...ins_bzl/cc/cc_static_library/test/test.cc b/...ic_library/test_cc_static_library/test.cc → ...ins_bzl/cc/cc_static_library/test/test.cc
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_static_library/test_cc_static_library/bar.h"
+#include "src/main/starlark/tests/builtins_bzl/cc/cc_static_library/test/bar.h"
 
 int main() {
   if (bar() != 84) {

diff --git a/src/main/starlark/tests/builtins_bzl/cc_builtin_tests.sh b/src/main/starlark/tests/builtins_bzl/cc_builtin_tests.sh
@@ -66,7 +66,7 @@ function test_starlark_cc() {
 bazel_dep(name = "test_repo", repo_name = "my_test_repo")
 local_path_override(
     module_name = "test_repo",
-    path = "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library2",
+    path = "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test2",
 )
 EOF
   if "$is_windows"; then
@@ -80,7 +80,7 @@ EOF
     //src/main/starlark/tests/builtins_bzl/cc/... || fail "expected success"
 }
 
-function test_cc_static_library_duplicate_symbol() {
+function test_duplicate_symbol() {
   mkdir -p pkg
   cat > pkg/BUILD<<'EOF'
 cc_static_library(
@@ -135,7 +135,7 @@ EOF
     &> $TEST_log || fail "Expected build to succeed"
 }
 
-function test_cc_static_library_duplicate_symbol_mixed_type() {
+function test_duplicate_symbol_mixed_type() {
   mkdir -p pkg
   cat > pkg/BUILD<<'EOF'
 cc_static_library(
@@ -190,7 +190,7 @@ EOF
     &> $TEST_log || fail "Expected build to succeed"
 }
 
-function test_cc_static_library_protobuf() {
+function test_protobuf() {
   if "$is_windows"; then
     # Fails on Windows due to long paths of the test workspace.
     return 0