summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2016-07-29 12:20:06 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2016-07-29 12:23:02 -0700
commit1ae579cae866ea91f340ef8de1f795e8236ad648 (patch)
tree558c418049276bc83e077c78e16b4cdf16c4657f /scripts
parent80ee988bceccf947c4c94891a90ea5eae3227766 (diff)
downloadscala-1ae579cae866ea91f340ef8de1f795e8236ad648.tar.gz
scala-1ae579cae866ea91f340ef8de1f795e8236ad648.tar.bz2
scala-1ae579cae866ea91f340ef8de1f795e8236ad648.zip
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
Diffstat (limited to 'scripts')
-rw-r--r--scripts/jobs/integrate/bootstrap4
-rwxr-xr-xscripts/jobs/integrate/windows2
-rwxr-xr-xscripts/jobs/validate/test2
3 files changed, 4 insertions, 4 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap
index 4d5dae89a2..86ba67bd8b 100644
--- a/scripts/jobs/integrate/bootstrap
+++ b/scripts/jobs/integrate/bootstrap
@@ -523,7 +523,7 @@ bootstrap() {
$clean \
$sbtBuildTask \
dist/mkQuick \
- publish | grep -v "was too long to be displayed in the webview, and will be left out"
+ publish
# clear ivy cache (and to be sure, local as well), so the next round of sbt builds sees the fresh scala
rm -rf $baseDir/ivy2
@@ -559,7 +559,7 @@ publishSonatype() {
-Dstarr.version=$SCALA_VER \
${updatedModuleVersions[@]} \
"setupBootstrapPublish $releaseTempRepoUrl $SCALA_VER" \
- $publishSonatypeTaskCore | grep -v "was too long to be displayed in the webview, and will be left out"
+ $publishSonatypeTaskCore
echo "### Publishing modules to sonatype"
# build/test/publish scala core modules to sonatype (this will start a new staging repo)
diff --git a/scripts/jobs/integrate/windows b/scripts/jobs/integrate/windows
index 5e04b0b380..f5e068684e 100755
--- a/scripts/jobs/integrate/windows
+++ b/scripts/jobs/integrate/windows
@@ -16,4 +16,4 @@ $SBT --warn "setupPublishCore" generateBuildCharacterPropertiesFile publishLocal
# Build quick and run the tests
parseScalaProperties buildcharacter.properties
-$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"
+$SBT -Dstarr.version=$maven_version_number --warn "setupValidateTest" testAll
diff --git a/scripts/jobs/validate/test b/scripts/jobs/validate/test
index 9938319dd8..7b00356390 100755
--- a/scripts/jobs/validate/test
+++ b/scripts/jobs/validate/test
@@ -23,7 +23,7 @@ case $prDryRun in
--warn \
"setupValidateTest $prRepoUrl" \
$testExtraArgs \
- testAll | grep -v "was too long to be displayed in the webview, and will be left out"
+ testAll
;;