Skip to content
This repository was archived by the owner on Jul 31, 2023. It is now read-only.

Commit c9a4da3

Browse files
authored
Simplify builds and tests: we no longer need to filter out _* targets. (#326)
1 parent bc1774e commit c9a4da3

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

tools/presubmit.sh

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,15 @@ function run() {
4444

4545
t0="$(date +%s)"
4646

47-
buildables="-- $(bazel query -k --noshow_progress "kind('^cc', //...)")"
47+
run bazel build //...
48+
run bazel test //...
4849

49-
tests="-- $(bazel query -k --noshow_progress \
50-
"kind(test, //...) \
51-
except attr('tags', 'manual', //...)")"
52-
53-
run bazel build $buildables
54-
run bazel test $tests
55-
56-
run bazel build -c opt $buildables
57-
run bazel test -c opt $tests
50+
run bazel build -c opt //...
51+
run bazel test -c opt //...
5852

5953
for config in asan ubsan; do
60-
run bazel test --config=$config $tests
61-
run bazel test --config=$config -c opt $tests
54+
run bazel test --config=$config //...
55+
run bazel test --config=$config -c opt //...
6256
done
6357

6458
t1="$(date +%s)"

tools/travis/build_bazel.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ echo "build --disk_cache=$HOME/bazel-cache" > ~/.bazelrc
3434
echo "build --experimental_strict_action_env" >> ~/.bazelrc
3535
du -sk $HOME/bazel-cache || true
3636

37-
bazel build $BAZEL_OPTIONS --experimental_ui_actions_shown=1 -k $(bazel query "kind(rule, //...)" | grep -v :_)
38-
bazel test $BAZEL_OPTIONS --experimental_ui_actions_shown=1 -k $(bazel query "kind(test, //...) except attr('tags', 'manual|noci', //...)" | grep -v :_)
37+
bazel build $BAZEL_OPTIONS -k //...
38+
bazel test $BAZEL_OPTIONS -k $(bazel query "kind(test, //...) except attr('tags', 'manual|noci', //...)")
3939

4040
du -sk $HOME/bazel-cache || true

0 commit comments

Comments
 (0)