Add and fix Bazel tests

PiperOrigin-RevId: 636821161
StefanBruens · May 24, 2024 · 1d7a729 · 1d7a729
1 parent 3b2aeda
commit 1d7a729
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 61 deletions.
diff --git a/.github/workflows/ubuntu-build.yml b/.github/workflows/ubuntu-build.yml
@@ -12,9 +12,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  cmake:
     runs-on: ubuntu-22.04
-    name: ubuntu-build
     steps:
       - name: Show env
         run: env
@@ -46,3 +45,15 @@ jobs:
         shell: bash
         run: |
           cmake --build build -j$(nproc)
+
+  bazel:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: bazel-contrib/[email protected]
+        with:
+          bazelisk-cache: true
+          disk-cache: ${{ github.workflow }}
+          repository-cache: true
+      - run: BAZEL_CXXOPTS="-std=c++17" bazel test //...
+      - run: BAZEL_CXXOPTS="-std=c++20" bazel test //...
diff --git a/pybind11_protobuf/tests/BUILD b/pybind11_protobuf/tests/BUILD
@@ -109,11 +109,6 @@ cc_proto_library(
     deps = [":we-love-dashes_proto"],
 )
 
-py_proto_library(
-    name = "we-love-dashes_py_pb2",
-    deps = [":we-love-dashes_proto"],
-)
-
 # Tests for enum_type_caster
 
 pybind_extension(
@@ -371,32 +366,8 @@ pybind_extension(
 py_test(
     name = "we_love_dashes_cc_only_test",
     srcs = ["we_love_dashes_cc_only_test.py"],
+    data = [":we_love_dashes_cc_only_module.so"],
     deps = [
-        ":we_love_dashes_cc_only_module",
-        "@com_google_absl_py//absl/testing:absltest",
-        "@com_google_protobuf//:protobuf_python",
-        requirement("absl_py"),
-    ],
-)
-
-py_test(
-    name = "we_love_dashes_cc_and_py_in_deps_test",
-    srcs = ["we_love_dashes_cc_and_py_in_deps_test.py"],
-    deps = [
-        ":we_love_dashes_cc_only_module",
-        ":we-love-dashes_py_pb2",
-        "@com_google_absl_py//absl/testing:absltest",
-        "@com_google_protobuf//:protobuf_python",
-        requirement("absl_py"),
-    ],
-)
-
-py_test(
-    name = "we_love_dashes_py_only_test",
-    srcs = ["we_love_dashes_py_only_test.py"],
-    deps = [
-        ":pass_proto2_message_module",
-        ":we-love-dashes_py_pb2",
         "@com_google_absl_py//absl/testing:absltest",
         "@com_google_protobuf//:protobuf_python",
         requirement("absl_py"),

diff --git a/scripts/build_and_run_tests.sh b/scripts/build_and_run_tests.sh
@@ -21,32 +21,8 @@ echo "Building and testing in $PWD using 'python' (version $PYVERSION)."
 
 bazel clean --expunge # Force a dep update
 
-# Currently only a subset of tests build.  The next one to fix is protobuf_test
-BAZEL_CXXOPTS="-std=c++17" bazel test --test_output=errors \
-    pybind11_protobuf/tests:extension_test \
-    pybind11_protobuf/tests:message_test \
-    pybind11_protobuf/tests:pass_by_test \
-    pybind11_protobuf/tests:proto_enum_test \
-    pybind11_protobuf/tests:wrapped_proto_module_test --enable_bzlmod
-
-BAZEL_CXXOPTS="-std=c++20" bazel test --test_output=errors \
-    pybind11_protobuf/tests:extension_test \
-    pybind11_protobuf/tests:message_test \
-    pybind11_protobuf/tests:pass_by_test \
-    pybind11_protobuf/tests:proto_enum_test \
-    pybind11_protobuf/tests:wrapped_proto_module_test --enable_bzlmod
-
-# Currently only a subset of tests build.  The next one to fix is protobuf_test
-BAZEL_CXXOPTS="-std=c++17" bazel test --test_output=errors \
-    pybind11_protobuf/tests:extension_test \
-    pybind11_protobuf/tests:message_test \
-    pybind11_protobuf/tests:pass_by_test \
-    pybind11_protobuf/tests:proto_enum_test \
-    pybind11_protobuf/tests:wrapped_proto_module_test --noenable_bzlmod
-
-BAZEL_CXXOPTS="-std=c++20" bazel test --test_output=errors \
-    pybind11_protobuf/tests:extension_test \
-    pybind11_protobuf/tests:message_test \
-    pybind11_protobuf/tests:pass_by_test \
-    pybind11_protobuf/tests:proto_enum_test \
-    pybind11_protobuf/tests:wrapped_proto_module_test --noenable_bzlmod
+BAZEL_CXXOPTS="-std=c++17" bazel test ... --test_output=errors "$@" --enable_bzlmod
+BAZEL_CXXOPTS="-std=c++20" bazel test ... --test_output=errors "$@" --enable_bzlmod
+
+BAZEL_CXXOPTS="-std=c++17" bazel test ... --test_output=errors "$@" --noenable_bzlmod
+BAZEL_CXXOPTS="-std=c++20" bazel test ... --test_output=errors "$@" --noenable_bzlmod