Skip to content

Commit 1ae579c

Browse files
committed
Make sure sbt's exit code is seen as script exit code
... and not grep's exit code, which would mean the test suite's result is determined by whether grep fails or not, instead of partest/junit's hard work
1 parent 80ee988 commit 1ae579c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

scripts/jobs/integrate/bootstrap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ bootstrap() {
523523
$clean \
524524
$sbtBuildTask \
525525
dist/mkQuick \
526-
publish | grep -v "was too long to be displayed in the webview, and will be left out"
526+
publish
527527

528528
# clear ivy cache (and to be sure, local as well), so the next round of sbt builds sees the fresh scala
529529
rm -rf $baseDir/ivy2
@@ -559,7 +559,7 @@ publishSonatype() {
559559
-Dstarr.version=$SCALA_VER \
560560
${updatedModuleVersions[@]} \
561561
"setupBootstrapPublish $releaseTempRepoUrl $SCALA_VER" \
562-
$publishSonatypeTaskCore | grep -v "was too long to be displayed in the webview, and will be left out"
562+
$publishSonatypeTaskCore
563563

564564
echo "### Publishing modules to sonatype"
565565
# build/test/publish scala core modules to sonatype (this will start a new staging repo)

scripts/jobs/integrate/windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ $SBT --warn "setupPublishCore" generateBuildCharacterPropertiesFile publishLocal
1616

1717
# Build quick and run the tests
1818
parseScalaProperties buildcharacter.properties
19-
$SBT -Dstarr.version=$maven_version_number --warn "setupValidateTest" testAll | grep -v "was too long to be displayed in the webview, and will be left out"
19+
$SBT -Dstarr.version=$maven_version_number --warn "setupValidateTest" testAll

scripts/jobs/validate/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ case $prDryRun in
2323
--warn \
2424
"setupValidateTest $prRepoUrl" \
2525
$testExtraArgs \
26-
testAll | grep -v "was too long to be displayed in the webview, and will be left out"
26+
testAll
2727

2828
;;
2929

0 commit comments

Comments
 (0)