diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-06-19 14:12:13 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-06-21 11:23:03 +0200 |
commit | e4c2d68fcf2aebe062faf2bdad08e07704b66d9a (patch) | |
tree | 5e1ba660b36a285e50652883bca96e7514fe592b /scripts | |
parent | b3283669e05dc706274e944ffd3750892c16e4dd (diff) | |
parent | aaf7bc0b948ee073934885f8240193a4ba2b3bb8 (diff) | |
download | scala-e4c2d68fcf2aebe062faf2bdad08e07704b66d9a.tar.gz scala-e4c2d68fcf2aebe062faf2bdad08e07704b66d9a.tar.bz2 scala-e4c2d68fcf2aebe062faf2bdad08e07704b66d9a.zip |
Merge commit 'aaf7bc0' into merge-2.11-to-2.12-june-19
Diffstat (limited to 'scripts')
-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 |