diff options
author | Adriaan Moors <adriaan@lightbend.com> | 2016-06-23 15:21:47 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-23 15:21:47 -0700 |
commit | 4e950838cbee187f3cee2ef197164792db74e56a (patch) | |
tree | 1c84b98ede763daa8bfe81c4bf55dfd38b3d3343 /scripts/jobs | |
parent | 79e7334f93da4717ee846f74e48ab53533e6756d (diff) | |
parent | 2d85fe47fddd3759db37e0106920688dcbceb7ef (diff) | |
download | scala-4e950838cbee187f3cee2ef197164792db74e56a.tar.gz scala-4e950838cbee187f3cee2ef197164792db74e56a.tar.bz2 scala-4e950838cbee187f3cee2ef197164792db74e56a.zip |
Merge pull request #5242 from szeiger/wip/merge-2.11-to-2.12-june-19
Merge 2.11 to 2.12 [ci: last-only]
Diffstat (limited to 'scripts/jobs')
-rwxr-xr-x | scripts/jobs/validate/publish-core | 4 | ||||
-rwxr-xr-x | scripts/jobs/validate/test | 35 |
2 files changed, 29 insertions, 10 deletions
diff --git a/scripts/jobs/validate/publish-core b/scripts/jobs/validate/publish-core index bb0056722d..b0bfd48083 100755 --- a/scripts/jobs/validate/publish-core +++ b/scripts/jobs/validate/publish-core @@ -16,7 +16,7 @@ case $prDryRun in ;; *) echo ">>> Getting Scala version number." - $SBT_CMD "setupPublishCore $prRepoUrl" generateBuildCharacterPropertiesFile + $SBT_CMD --warn "setupPublishCore $prRepoUrl" generateBuildCharacterPropertiesFile parseScalaProperties buildcharacter.properties # produce maven_version_number echo ">>> Checking availability of Scala ${maven_version_number} in $prRepoUrl." @@ -27,7 +27,7 @@ case $prDryRun in if $libraryAvailable && $reflectAvailable && $compilerAvailable; then echo "Scala core already built!" else - $SBT_CMD "setupPublishCore $prRepoUrl" $antBuildArgs publish + $SBT_CMD --warn "setupPublishCore $prRepoUrl" publish fi mv buildcharacter.properties jenkins.properties # parsed by the jenkins job diff --git a/scripts/jobs/validate/test b/scripts/jobs/validate/test index 7c7024e87c..3cd8af5608 100755 --- a/scripts/jobs/validate/test +++ b/scripts/jobs/validate/test @@ -1,17 +1,36 @@ -#!/bin/bash -e +#!/bin/bash -e -v -x + +baseDir=${WORKSPACE-`pwd`} +scriptsDir="$baseDir/scripts" +. $scriptsDir/common case $prDryRun in + yep) echo "DRY RUN" ;; + *) - ./pull-binary-libs.sh # build quick using STARR built upstream, as specified by scalaVersion - # (in that sense it's locker, since it was built with starr by that upstream job) - ant -Dstarr.version=$scalaVersion \ - -Dscalac.args.optimise=-opt:l:classpath \ - -Dlocker.skip=1 -Dextra.repo.url=$prRepoUrl \ - $testExtraArgs ${testTarget-test.core docs.done} + # (in that sense it's locker, since it was built with starr by that upstream job); + # and run JUnit tests, partest, OSGi tests, MiMa and scaladoc + $SBT_CMD \ + -Dstarr.version=$scalaVersion \ + --warn \ + "setupValidateTest $prRepoUrl" \ + $testExtraArgs \ + "test" \ + "partest run pos neg jvm" \ + "partest res scalap specialized scalacheck" \ + "partest instrumented presentation" \ + "partest --srcpath scaladoc" \ + osgiTestFelix/test \ + osgiTestEclipse/test \ + library/mima \ + reflect/mima \ + doc + ;; -esac
\ No newline at end of file + +esac |