diff options
| author |  ccalvarin <ccalvarin@google.com> | 2017-10-16 22:18:32 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-10-18 10:27:58 +0200 |
| commit | 7cd9e883dd31f54cd505844aa1f1e0ed7bd9f380 (patch) | |
| tree | e72e67a2f22108d490aaf4b5a59e5727e855547d /src/test/shell | |
| parent | b6bf11217c30123827d36a35a3614ba8e200f349 (diff) | |
Track Option placement within a priority category.
An option has precedence over previous options at the same enum-valued priority. Track its placement in this ordering explicitly.
This will allow after-the-fact expansion of expansion options such that they correctly take precedence or not compared to other mentions of the same flag. This is needed to fix --config's expansion.
RELNOTES: None.
PiperOrigin-RevId: 172367996
Diffstat (limited to 'src/test/shell')
| -rwxr-xr-x | src/test/shell/integration/incompatible_changes_conflict_test.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/shell/integration/incompatible_changes_conflict_test.sh b/src/test/shell/integration/incompatible_changes_conflict_test.sh index 0b0ed5081f..af3bad3b85 100755 --- a/src/test/shell/integration/incompatible_changes_conflict_test.sh +++ b/src/test/shell/integration/incompatible_changes_conflict_test.sh @@ -26,9 +26,9 @@ source "${CURRENT_DIR}/../integration_test_setup.sh" \ # The clash canary flags are built into the canonicalize-flags command # specifically for this test suite. -canary_clash_error="The option 'flag_clash_canary' was expanded to from both " -canary_clash_error+="options 'flag_clash_canary_expander1' and " -canary_clash_error+="'flag_clash_canary_expander2'." +canary_clash_error="option '--flag_clash_canary' was expanded to from both " +canary_clash_error+="option '--flag_clash_canary_expander1' and " +canary_clash_error+="option '--flag_clash_canary_expander2'." # Ensures that we didn't change the formatting of the warning message or # disable the warning. @@ -53,8 +53,8 @@ function test_canonicalize_flags_suppresses_warnings() { function test_no_conflicts_among_incompatible_changes() { bazel canonicalize-flags --show_warnings -- --all_incompatible_changes \ &>$TEST_log || fail "bazel canonicalize-flags failed"; - expected="The option '.*' was expanded to from both options " - expected+="'.*' and '.*'." + expected="The option '.*' was expanded to from both option " + expected+="'.*' and option '.*'." fail_msg="Options conflict in expansion of --all_incompatible_changes" expect_not_log "$expected" "$fail_msg" } |