diff options
| author |  Abhishek Arya <inferno@chromium.org> | 2020-03-04 17:06:06 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-03-04 17:06:06 -0800 |
| commit | d444fc7c08605bb0282ae0971f46cc71cbb03f73 (patch) | |
| tree | ff6345db09f721a676d29df451429f0dabec4dc1 /projects | |
| parent | 7fb97cb3d6ef8e0afe1918cd638eeab629fbe412 (diff) | |
Fix ESPv2 build (#3461)
* Fix ESPv2 build
Don't assume correlation between file name and bazel target name.
Signed-off-by: Teju Nareddy <nareddyt@google.com>
* Fix some bash errors with splitting
Signed-off-by: Teju Nareddy <nareddyt@google.com>
* Coverage expects a path, not target
Signed-off-by: Teju Nareddy <nareddyt@google.com>
Diffstat (limited to 'projects')
| -rwxr-xr-x | projects/esp-v2/build.sh | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/projects/esp-v2/build.sh b/projects/esp-v2/build.sh index 6198e5f6..e2fca4d8 100755 --- a/projects/esp-v2/build.sh +++ b/projects/esp-v2/build.sh @@ -20,9 +20,6 @@ export CFLAGS="$CFLAGS" export CXXFLAGS="$CXXFLAGS" -declare -r FUZZER_TARGETS_CC=$(find . -name *_fuzz_test.cc) -declare -r FUZZER_TARGETS="$(for t in ${FUZZER_TARGETS_CC}; do echo "${t:2:-3}"; done)" - FUZZER_DICTIONARIES="\ " @@ -51,15 +48,16 @@ fi declare BAZEL_BUILD_TARGETS="" declare BAZEL_CORPUS_TARGETS="" declare FILTERED_FUZZER_TARGETS="" -for t in ${FUZZER_TARGETS} +for t in $(bazel query 'src/...' --output label | grep '_fuzz_test$') do - declare BAZEL_PATH="//"$(dirname "$t")":"$(basename "$t") - declare TAGGED=$(bazel query "attr('tags', 'no_fuzz', ${BAZEL_PATH})") + declare TAGGED=$(bazel query "attr('tags', 'no_fuzz', ${t})") if [ -z "${TAGGED}" ] then - FILTERED_FUZZER_TARGETS+="$t " - BAZEL_BUILD_TARGETS+="${BAZEL_PATH}_driverless " - BAZEL_CORPUS_TARGETS+="${BAZEL_PATH}_corpus_tar " + BASE_PATH=${t//://} + BASE_PATH=${BASE_PATH#"//"} + FILTERED_FUZZER_TARGETS+="${BASE_PATH} " + BAZEL_BUILD_TARGETS+="${t}_driverless " + BAZEL_CORPUS_TARGETS+="${t}_corpus_tar " fi done |