Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

Include compiler flags from system property when interpreting pragma #22

Merged
merged 3 commits into from
Aug 14, 2014
Merged

Include compiler flags from system property when interpreting pragma #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5ccf33
Include compiler flags from system property when interpreting pragma
lrytz Aug 14, 2014
5de8118
version number for 1.0.1 release
lrytz Aug 14, 2014
77910d3
bump version number to next snapshot
lrytz Aug 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ scalaModuleSettings

name := "scala-partest"

version := "1.0.1-SNAPSHOT"
version := "1.0.2-SNAPSHOT"

scalaVersion := "2.11.0"

Expand Down
3 changes: 2 additions & 1 deletion src/main/scala/scala/tools/partest/nest/Runner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,8 @@ class Runner(val testFile: File, val suiteRunner: SuiteRunner) {
// use lines in block so labeled? Default to sorry, Charlie.
def retainOn(expr: String) = {
val f = expr.trim
def flagWasSet(f: String) = suiteRunner.scalacExtraArgs contains f
val allArgs = suiteRunner.scalacExtraArgs ++ PartestDefaults.scalacOpts.split(' ')
def flagWasSet(f: String) = allArgs contains f
val (invert, token) =
if (f startsWith "!") (true, f drop 1) else (false, f)
val cond = token.trim match {
Expand Down