summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2010-12-21 17:41:31 +0000
committerAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2010-12-21 17:41:31 +0000
commit003fc687839528bf99b44a415a038eb13ef8eae5 (patch)
tree597e57e8882449865bcde4c214188bb87c4709df /project
parentcc1f960036c0f60caca6c8f862701dd37bac2f50 (diff)
downloadscala-003fc687839528bf99b44a415a038eb13ef8eae5.tar.gz
scala-003fc687839528bf99b44a415a038eb13ef8eae5.tar.bz2
scala-003fc687839528bf99b44a415a038eb13ef8eae5.zip
Bencharking a larger program with parallel coll...
Bencharking a larger program with parallel collections. Fixed a couple of bugs in parallel collections. No review.
Diffstat (limited to 'project')
-rwxr-xr-xproject/build/Partest.scala7
1 files changed, 3 insertions, 4 deletions
diff --git a/project/build/Partest.scala b/project/build/Partest.scala
index 009064c005..709425b3e3 100755
--- a/project/build/Partest.scala
+++ b/project/build/Partest.scala
@@ -38,14 +38,14 @@ trait PartestRunner{
lazy val posFilesTest = TestSet(Std,"pos", "Compiling files that are expected to build", testFiles / "pos" * ("*.scala" || DirectoryFilter))
lazy val negFilesTest = TestSet(Std,"neg", "Compiling files that are expected to fail", testFiles / "neg" * ("*.scala" || DirectoryFilter))
- lazy val runFilesTest = TestSet(Std,"run", "Compiling and running files", testFiles / "run" ** ("*.scala" ))
+ lazy val runFilesTest = TestSet(Std,"run", "Compiling and running files", testFiles / "run" * ("*.scala" || DirectoryFilter))
lazy val jvmFilesTest = TestSet(Std,"jvm", "Compiling and running files", testFiles / "jvm" *("*.scala" || DirectoryFilter))
lazy val resFilesTest = TestSet(Std,"res", "Running resident compiler scenarii", testFiles / "res" * ("*.res"))
lazy val buildmanagerFilesTest = TestSet(Std,"buildmanager", "Running Build Manager scenarii", testFiles / "buildmanager" * DirectoryFilter)
- lazy val scalacheckFilesTest = TestSet(Std,"scalacheck", "Running scalacheck tests", testFiles / "scalacheck" ** ("*.scala"))
+ lazy val scalacheckFilesTest = TestSet(Std,"scalacheck", "Running scalacheck tests", testFiles / "scalacheck" * ("*.scala" || DirectoryFilter))
lazy val scriptFilesTest = TestSet(Std,"script", "Running script files", testFiles / "script" * ("*.scala"))
lazy val shootoutFilesTest = TestSet(Std,"shootout", "Running shootout tests", testFiles / "shootout" * ("*.scala"))
- lazy val scalapFilesTest = TestSet(Std,"scalap", "Running scalap tests", testFiles / "scalap" ** ("*.scala"))
+ lazy val scalapFilesTest = TestSet(Std,"scalap", "Running scalap tests", testFiles / "scalap" * ("*.scala"))
lazy val negContinuationTest = TestSet(Continuations,"neg", "Compiling continuations files that are expected to fail", testFiles / "continuations-neg" * ("*.scala" || DirectoryFilter))
lazy val runContinuationTest = TestSet(Continuations,"run", "Compiling and running continuations files", testFiles / "continuations-run" ** ("*.scala" ))
@@ -150,7 +150,6 @@ trait PartestRunner{
}
-
resolve0(l.map(Path.fromString(testFiles,_).asFile),filesTestMap.values.toList,sets)
}