From 8c7f93d7a58eb4e2a394b8b9ae188e3b28775043 Mon Sep 17 00:00:00 2001 From: Antonio Cunei Date: Thu, 21 Dec 2017 15:25:24 +0100 Subject: [PATCH 1/2] Keep tests/fork-parallel disabled, but add an explanation See https://github.com/sbt/sbt/issues/3545#issuecomment-353247827 --- sbt/src/sbt-test/tests/fork-parallel/test | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sbt/src/sbt-test/tests/fork-parallel/test b/sbt/src/sbt-test/tests/fork-parallel/test index 9d76b41e6..7cbc6d0a3 100644 --- a/sbt/src/sbt-test/tests/fork-parallel/test +++ b/sbt/src/sbt-test/tests/fork-parallel/test @@ -1,8 +1,23 @@ -# https://github.com/sbt/sbt/issues/3545 +# The tests/fork-parallel test will currently always +# report success when run on less than four cores, +# rather than failing in one of the two cases as expected. +# +# TODO: Adjust this scripted test so that it works as +# intended on less than four cores as well. +# +# To debug, it is possible to limit the number of cores +# reported to sbt, and run the test, by using: +# +# taskset 0x00000003 sbt 'scripted tests/fork-parallel' +# +# See: https://github.com/sbt/sbt/issues/3545 +# + +# This bit won't currently work when using less than four cores. # > test # -> check > clean > set testForkedParallel := true > test -> check \ No newline at end of file +> check From eb0bf307120e7e0d6c590a4ae8e06f71d99f7942 Mon Sep 17 00:00:00 2001 From: Antonio Cunei Date: Sat, 23 Dec 2017 05:00:38 +0100 Subject: [PATCH 2/2] Adjustments to test file. Scripted can't cope with empty comments Apparently an empty comment line, meaning a single '#' on a line, cannot be fed to scripted, which will complain with an odd error message. This commit tweaks the comments in the tests/fork-parallel file so that there are no empty comment lines. --- sbt/src/sbt-test/tests/fork-parallel/test | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sbt/src/sbt-test/tests/fork-parallel/test b/sbt/src/sbt-test/tests/fork-parallel/test index 7cbc6d0a3..662328f42 100644 --- a/sbt/src/sbt-test/tests/fork-parallel/test +++ b/sbt/src/sbt-test/tests/fork-parallel/test @@ -1,17 +1,13 @@ # The tests/fork-parallel test will currently always # report success when run on less than four cores, # rather than failing in one of the two cases as expected. -# # TODO: Adjust this scripted test so that it works as # intended on less than four cores as well. -# + # To debug, it is possible to limit the number of cores # reported to sbt, and run the test, by using: -# # taskset 0x00000003 sbt 'scripted tests/fork-parallel' -# # See: https://github.com/sbt/sbt/issues/3545 -# # This bit won't currently work when using less than four cores. # > test