diff --git a/src/java/io/bazel/rulesscala/worker/WorkerTest.java b/src/java/io/bazel/rulesscala/worker/WorkerTest.java index 4419ee2ea..80b60ddbf 100644 --- a/src/java/io/bazel/rulesscala/worker/WorkerTest.java +++ b/src/java/io/bazel/rulesscala/worker/WorkerTest.java @@ -55,7 +55,12 @@ public void work(String[] args) { } }; - String contents = "line 1\n--flag_1\nsome arg\n"; + String contents = String.join( + System.getProperty("line.separator"), + "line 1", + "--flag_1", + "some arg", + ""); // The output will always have a line separator at the end. Files.write(tmpFile, contents.getBytes(StandardCharsets.UTF_8)); @@ -69,8 +74,8 @@ public void work(String[] args) { WorkerProtocol.WorkResponse response = WorkerProtocol.WorkResponse.parseDelimitedFrom(helper.responseIn); - assertEquals(response.getExitCode(), 0); - assertEquals(response.getOutput(), contents); + assertEquals(0, response.getExitCode()); + assertEquals(contents, response.getOutput()); } finally { Files.deleteIfExists(tmpFile); } diff --git a/test_rules_scala.sh b/test_rules_scala.sh index d05abddaa..e1c362c06 100755 --- a/test_rules_scala.sh +++ b/test_rules_scala.sh @@ -11,20 +11,21 @@ test_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/test/shell # shellcheck source=./test_runner.sh . "${test_dir}"/test_runner.sh runner=$(get_test_runner "${1:-local}") +test_output_flag="--test_output=errors" . "${test_dir}"/test_bzlmod_macros.sh -$runner bazel build test/... -#$runner bazel build "test/... --all_incompatible_changes" -$runner bazel test test/... -$runner bazel test third_party/... +$runner bazel build "src/... test/..." +#$runner bazel build "src/... test/... --all_incompatible_changes" +$runner bazel test "${test_output_flag} src/... test/..." +$runner bazel test "${test_output_flag} third_party/..." $runner bazel build "--extra_toolchains=//test/toolchains:high_level_transitive_deps_strict_deps_error -- test/..." $runner bazel build "--extra_toolchains=//scala:minimal_direct_source_deps -- test/..." #$runner bazel build "--extra_toolchains=//test/toolchains:high_level_transitive_deps_strict_deps_error --all_incompatible_changes -- test/..." -$runner bazel test "--extra_toolchains=//test/toolchains:high_level_transitive_deps_strict_deps_error -- test/..." -$runner bazel test "--extra_toolchains=//scala:minimal_direct_source_deps -- test/..." +$runner bazel test "${test_output_flag} --extra_toolchains=//test/toolchains:high_level_transitive_deps_strict_deps_error -- test/..." +$runner bazel test "${test_output_flag} --extra_toolchains=//scala:minimal_direct_source_deps -- test/..." $runner bazel build "test_expect_failure/missing_direct_deps/internal_deps/... --strict_java_deps=warn --extra_toolchains=//test/toolchains:high_level_transitive_deps_strict_deps_warn" $runner bazel build //test_expect_failure/proto_source_root/... --strict_proto_deps=off -$runner bazel test //test/... --extra_toolchains="//test_expect_failure/plus_one_deps:plus_one_deps" +$runner bazel test "$test_output_flag" //test/... --extra_toolchains="//test_expect_failure/plus_one_deps:plus_one_deps" $runner bazel build test:ScalaBinaryInGenrule --nolegacy_external_runfiles $runner bazel build //test_statsfile:Simple_statsfile $runner bazel build //test_statsfile:SimpleNoStatsFile_statsfile --extra_toolchains="//test/toolchains:enable_stats_file_disabled_toolchain"