From b5ccf3301a67c468f80c9bfb0de82aca3f2ffbf0 Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@gmail.com>
Date: Thu, 14 Aug 2014 21:40:56 +0200
Subject: [PATCH 1/3] Include compiler flags from system property when
 interpreting pragma

When interpreting the #partest pragma in check files, also look for
compiler flags that were provided using the partest.scalac_opts system
property. That is, for example, when running

    SCALAC_OPTS="-Ydelambdafy:method" test/partest test/files/...
---
 src/main/scala/scala/tools/partest/nest/Runner.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/scala/tools/partest/nest/Runner.scala b/src/main/scala/scala/tools/partest/nest/Runner.scala
index 6ebe444..602a494 100644
--- a/src/main/scala/scala/tools/partest/nest/Runner.scala
+++ b/src/main/scala/scala/tools/partest/nest/Runner.scala
@@ -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 {

From 5de81189a5aee0b45704a6694e0fc6829a6ba02a Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@gmail.com>
Date: Thu, 14 Aug 2014 22:48:11 +0200
Subject: [PATCH 2/3] version number for 1.0.1 release

---
 build.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index 10ae259..9a9c351 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,7 +4,7 @@ scalaModuleSettings
 
 name                       := "scala-partest"
 
-version                    := "1.0.1-SNAPSHOT"
+version                    := "1.0.1"
 
 scalaVersion               := "2.11.0"
 

From 77910d311db9efa60a77293671083a9c6f8d5e3c Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@gmail.com>
Date: Thu, 14 Aug 2014 22:48:36 +0200
Subject: [PATCH 3/3] bump version number to next snapshot

---
 build.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index 9a9c351..b291815 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,7 +4,7 @@ scalaModuleSettings
 
 name                       := "scala-partest"
 
-version                    := "1.0.1"
+version                    := "1.0.2-SNAPSHOT"
 
 scalaVersion               := "2.11.0"