diff --git a/shared.bazelrc b/shared.bazelrc index 5d4e50e0..802ee567 100644 --- a/shared.bazelrc +++ b/shared.bazelrc @@ -39,3 +39,6 @@ build --nolegacy_important_outputs build --bes_upload_mode=fully_async run --bes_backend= run --bes_results_url= + +# Easily run without caches +common:no_cache --remote_cache= --disk_cache= --repository_cache= diff --git a/tests/bzltidy_tests/tidy_all_test.sh b/tests/bzltidy_tests/tidy_all_test.sh index d7c8c5d5..8d62b6c9 100755 --- a/tests/bzltidy_tests/tidy_all_test.sh +++ b/tests/bzltidy_tests/tidy_all_test.sh @@ -35,7 +35,7 @@ create_scratch_dir_sh="$(rlocation "${create_scratch_dir_sh_location}")" || \ find_tidy_out_files() { local start_dir="$1" - find "${start_dir}" -name "*.tidy_out" + find "${start_dir}" -name "*.tidy_out" | sort -u } revert_changes() { @@ -104,8 +104,8 @@ while IFS=$'\n' read -r line; do tidy_out_files+=("$line"); done < <( find_tidy_out_files "${scratch_dir}" ) assert_equal 2 ${#tidy_out_files[@]} "${assert_msg}" -assert_match parent\.tidy_out "${tidy_out_files[0]}" "${assert_msg}" -assert_match child_workspaces/bar/bar\.tidy_out "${tidy_out_files[1]}" "${assert_msg}" +assert_match child_workspaces/bar/bar\.tidy_out "${tidy_out_files[0]}" "${assert_msg}" +assert_match parent\.tidy_out "${tidy_out_files[1]}" "${assert_msg}" assert_match \ "${output_prefix_regex}"\ Running\ //:my_tidy\ in\ .*child_workspaces/bar \ "${output}" "${assert_msg}" @@ -119,6 +119,6 @@ while IFS=$'\n' read -r line; do tidy_out_files+=("$line"); done < <( find_tidy_out_files "${scratch_dir}" ) assert_equal 2 ${#tidy_out_files[@]} "${assert_msg}" -assert_match parent\.tidy_out "${tidy_out_files[0]}" "${assert_msg}" -assert_match child_workspaces/bar/bar\.tidy_out "${tidy_out_files[1]}" "${assert_msg}" +assert_match child_workspaces/bar/bar\.tidy_out "${tidy_out_files[0]}" "${assert_msg}" +assert_match parent\.tidy_out "${tidy_out_files[1]}" "${assert_msg}" assert_match "${output_prefix_regex}"\ Skipping\ .*foo\. "${output}" "${assert_msg}"