Skip to content

Bug fixes for the sbt build and partest#4881

Merged
SethTisue merged 3 commits intoscala:2.11.xfrom
szeiger:wip/sbt-partest
Dec 13, 2015
Merged

Bug fixes for the sbt build and partest#4881
SethTisue merged 3 commits intoscala:2.11.xfrom
szeiger:wip/sbt-partest

Conversation

@szeiger
Copy link
Contributor

@szeiger szeiger commented Dec 12, 2015

  • Use the latest versions of scala-partest and scala-partest-interface for selective test running and other partest features
  • Create partest.properties from sbt. This is required to run the command-line version of partest on the build output.
  • Bug fix: The sbt build didn't always ensure that build-sbt/pack existed before trying to write to it
  • Bug fix: The sbt build depended on the output of "packageBin" which caused the wrong packaging task to run (built-in instead of OSGi o OSGi-enabled subprojects).

Review by @SethTisue

- Create the directory for the output file when building an OSGi
  bundle. Otherwise a publishing command would fail if dist/mkPack had
  not been run before.

- Depend only on “packagedArtifact” in “mkPack”, not on “packageBin”.
  The latter is sbt’s standard packaging task but some of the required
  dependencies need to be packaged as OSGi bundles.
- Fix the scoping of files/lib/*.jar. These files were not on the
  classpath when running partest from sbt.

- Pass the same standard Java options to partest as from the command
  line. This requires new versions of scala-partest and
  scala-partest-interface.

- Fix the classpath scanning in jvm/innerClassEnclMethodJavaReflection.
  It only worked for JARs and relative directories but not for absolute
  directory paths (which are produced by sbt).
This allows partest to be run from the command line on the artifacts
produced by the sbt build. The actual location for partest.properties
is hardcoded in the partest script as build/pack/partest.properties.
This will have to be changed when we make sbt the default build tool.
To test this now you can manually copy the generated file from
build-sbt/quick/partest.properties to build/pack/partest.properties.
@scala-jenkins scala-jenkins added this to the 2.11.8 milestone Dec 12, 2015
@SethTisue
Copy link
Member

LGTM assuming Jenkins likes it

SethTisue added a commit that referenced this pull request Dec 13, 2015
Bug fixes for the sbt build and partest
@SethTisue SethTisue merged commit a0dabe3 into scala:2.11.x Dec 13, 2015
@SethTisue
Copy link
Member

the integrate-ide failure is unrelated to the changes in this PR

@janekdb
Copy link
Member

janekdb commented Dec 20, 2015

/rebuild

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants