diff options
author | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-06-19 13:40:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-19 13:40:11 +0200 |
commit | aaf7bc0b948ee073934885f8240193a4ba2b3bb8 (patch) | |
tree | 37e189bfd35440ed88f84007d03e29b8f01088b0 /scripts | |
parent | 91b6944480a3b37f1d62a8a2ed3c332ce02a835a (diff) | |
parent | c2c08a45a99f6ba48d8dc3b7c06d44196e50a2a2 (diff) | |
download | scala-aaf7bc0b948ee073934885f8240193a4ba2b3bb8.tar.gz scala-aaf7bc0b948ee073934885f8240193a4ba2b3bb8.tar.bz2 scala-aaf7bc0b948ee073934885f8240193a4ba2b3bb8.zip |
Merge pull request #5190 from szeiger/wip/validate-test-use-sbt
Use sbt for PR validation [ci: last-only]
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 bedef2e458..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=-optimise \ - -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 |