Skip to content

Commit

Permalink
test_wrapper_test: fix for incompatible flag
Browse files Browse the repository at this point in the history
--incompatible_windows_style_arg_escaping will no
longer break this test.

see bazelbuild#7454
  • Loading branch information
laszlocsomor committed Apr 8, 2019
1 parent 3f7f255 commit 01f0ae0
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions src/test/py/bazel/test_wrapper_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,10 @@ def _AssertTestArgs(self, flag, expected):
bazel_bin = bazel_bin[0]

exit_code, stdout, stderr = self.RunBazel([
# --[no]incompatible_windows_style_arg_escaping affects what arguments
# the test receives. Run with --incompatible_windows_style_arg_escaping
# to test for future (as of 2019-04-05) behavior.
'--incompatible_windows_style_arg_escaping',
'test',
'//foo:testargs_test.exe',
'-t-',
Expand Down Expand Up @@ -559,19 +563,19 @@ def testTestExecutionWithTestSetupSh(self):
flag,
[
'(foo)',
# If https://github.com/bazelbuild/bazel/issues/6277 is ever fixed,
# then assert that (a b) is one argument.
'(a)',
'(b)',
# If https://github.com/bazelbuild/bazel/issues/6276 is ever fixed,
# then assert that there's an empty argument before (c d).
'(c d)',
'()',
'(bar)',
'(baz)',
'("x y")',
# I (laszlocsomor@) don't know the exact reason (as of 2019-04-05)
# why () and (qux) are mangled as they are, but since I'm planning
# to phase out test-setup.sh on Windows in favor of the native test
# wrapper, I don't intend to debug this further. The test is here
# merely to guard against unwanted future change of behavior.
'(\\" qux)'
'("")',
'(qux)',
])
self._AssertUndeclaredOutputs(flag)
self._AssertUndeclaredOutputsAnnotations(flag)
Expand Down

0 comments on commit 01f0ae0

Please sign in to comment.