Console output: switch to file line ending

As nobody uses bazel on a traditional teletyper terminal, we
can as well use the line ending of native files instead of
terminal/network line endings. While the console output is not
meant to be handled by anything but a terminal, this still seems
to be done.

Change-Id: Ied745eeedaec70572ef4b3a3c716a0cf57dfdfd1
PiperOrigin-RevId: 207511649

4 files changed, 6 insertions, 5 deletions

diff --git a/src/test/shell/bazel/bazel_sandboxing_test.sh b/src/test/shell/bazel/bazel_sandboxing_test.sh
index 70f2d4854a..379a302f63 100755
--- a/src/test/shell/bazel/bazel_sandboxing_test.sh
+++ b/src/test/shell/bazel/bazel_sandboxing_test.sh
@@ -516,7 +516,7 @@ EOF
   expect_not_log "Executing genrule //:test failed: linux-sandbox failed: error executing command"
 
   # This is the error message telling us that some output artifacts couldn't be copied.
-  expect_log "Could not move output artifacts from sandboxed execution."
+  expect_log "Could not move output artifacts from sandboxed execution"
 
   # The build fails, because the action didn't generate its output artifact.
   expect_log "ERROR:.*Executing genrule //:test failed"
diff --git a/src/test/shell/bazel/workspace_test.sh b/src/test/shell/bazel/workspace_test.sh
index 72915a8b27..680d71153e 100755
--- a/src/test/shell/bazel/workspace_test.sh
+++ b/src/test/shell/bazel/workspace_test.sh
@@ -575,7 +575,7 @@ EOF
 
   cd mainrepo
   bazel query //... &>"$TEST_log" || fail "Expected query to succeed"
-  expect_log "def.bzl loaded."
+  expect_log "def.bzl loaded"
   expect_not_log "external"
 }
 
diff --git a/src/test/shell/integration/incompatible_changes_conflict_test.sh b/src/test/shell/integration/incompatible_changes_conflict_test.sh
index af3bad3b85..81b549d870 100755
--- a/src/test/shell/integration/incompatible_changes_conflict_test.sh
+++ b/src/test/shell/integration/incompatible_changes_conflict_test.sh
@@ -28,7 +28,7 @@ source "${CURRENT_DIR}/../integration_test_setup.sh" \
 # specifically for this test suite.
 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'."
+canary_clash_error+="option '--flag_clash_canary_expander2'"
 
 # Ensures that we didn't change the formatting of the warning message or
 # disable the warning.
diff --git a/src/test/shell/integration/ui_test.sh b/src/test/shell/integration/ui_test.sh
index c3651cd7eb..4fb046d932 100755
--- a/src/test/shell/integration/ui_test.sh
+++ b/src/test/shell/integration/ui_test.sh
@@ -59,7 +59,7 @@ function test_line_wrapping() {
   # something is written in green
   expect_log $'\x1b\[32m'
   # lines are wrapped, hence at least one line should end with backslash
-  expect_log '\\'$'\r''$'
+  expect_log '\\'$'\r''$\|\\$'
 }
 
 function test_noline_wrapping_color_nocurses() {
@@ -68,8 +68,9 @@ function test_noline_wrapping_color_nocurses() {
   expect_log $'\x1b\[32m'
   # no lines are deleted
   expect_not_log $'\x1b\[K'
-  # as no line wrapping occurs, no backlsash should be before a carriage return
+  # as no line wrapping occurs, no backlsash should be before a carriage return or at a line ending
   expect_not_log '\\'$'\r'
+  expect_not_log '\\$'
 }