diff options
| -rw-r--r-- | .bazelrc | 2 | ||||
| -rw-r--r-- | .github/workflows/run-all-tests.yml | 4 | ||||
| -rw-r--r-- | driver/BUILD.bazel | 10 | ||||
| -rw-r--r-- | third_party/jni/BUILD.bazel | 13 |
4 files changed, 15 insertions, 14 deletions
@@ -4,6 +4,8 @@ build -c opt # C/C++ build --cxxopt='-std=c++17' build --action_env=CC=clang +# Requires a relatively modern clang. +build:ci --features=layering_check # Java build --java_language_version=8 diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index b3f2a626..d69e173d 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -47,10 +47,10 @@ jobs: run: curl -LO https://github.com/bazelbuild/bazelisk/releases/download/v1.7.5/bazelisk-darwin-amd64 && chmod +x bazelisk-darwin-amd64 - name: Build - run: ./bazelisk-${{ matrix.arch }}-amd64 build --disk_cache=${{ matrix.cache }} -c opt ${{ matrix.jdk8_flag }} //... + run: ./bazelisk-${{ matrix.arch }}-amd64 build --config=ci --disk_cache=${{ matrix.cache }} -c opt ${{ matrix.jdk8_flag }} //... - name: Test - run: ./bazelisk-${{ matrix.arch }}-amd64 test --disk_cache=${{ matrix.cache }} -c opt ${{ matrix.jdk8_flag }} --test_tag_filters="-broken-on-${{ matrix.arch }}" //... + run: ./bazelisk-${{ matrix.arch }}-amd64 test --config=ci --disk_cache=${{ matrix.cache }} -c opt ${{ matrix.jdk8_flag }} --test_tag_filters="-broken-on-${{ matrix.arch }}" //... - name: Upload test logs if: always() diff --git a/driver/BUILD.bazel b/driver/BUILD.bazel index 63ae6437..c5bf6a28 100644 --- a/driver/BUILD.bazel +++ b/driver/BUILD.bazel @@ -12,6 +12,7 @@ cc_test( srcs = ["sanitizer_hooks_with_pc_test.cpp"], deps = [ ":sanitizer_hooks_with_pc", + "@googletest//:gtest", "@googletest//:gtest_main", ], ) @@ -22,23 +23,22 @@ cc_library( "coverage_tracker.cpp", "fuzz_target_runner.cpp", "fuzzed_data_provider.cpp", + "java_reproducer_templates.h", "jvm_tooling.cpp", "libfuzzer_callbacks.cpp", + "libfuzzer_callbacks.h", "libfuzzer_driver.cpp", "signal_handler.cpp", + "signal_handler.h", "utils.cpp", + "utils.h", ], hdrs = [ "coverage_tracker.h", "fuzz_target_runner.h", "fuzzed_data_provider.h", - "java_reproducer_templates.h", "jvm_tooling.h", - "libfuzzer_callbacks.h", "libfuzzer_driver.h", - "sanitizer_hooks_with_pc.h", - "signal_handler.h", - "utils.h", ], linkopts = [ "-ldl", diff --git a/third_party/jni/BUILD.bazel b/third_party/jni/BUILD.bazel index 3cbaba61..21f3fe1f 100644 --- a/third_party/jni/BUILD.bazel +++ b/third_party/jni/BUILD.bazel @@ -3,10 +3,9 @@ load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") cc_library( name = "jni", + hdrs = [":jni_headers"], visibility = ["//visibility:public"], - deps = [ - ":jni_headers", - ] + select({ + deps = select({ "@platforms//os:osx": [":libjvm_osx"], "//conditions:default": [":libjvm_linux"], }), @@ -14,10 +13,10 @@ cc_library( cc_library( name = "jni_headers_only", - visibility = ["//visibility:public"], - deps = [ + hdrs = [ ":jni_headers", ], + visibility = ["//visibility:public"], ) genrule( @@ -38,9 +37,9 @@ genrule( cmd = "cp -f $< $@", ) -cc_import( +filegroup( name = "jni_headers", - hdrs = [ + srcs = [ ":jni_header", ":jni_md_header", ], |