Enabled scalacheck tests. Renamed the super confusing and
what must be legacy scalatest.* properties to partest.*, boldly assuming that the fact that partest is pretty much unusable outside of scalac means there are no users outside of scalac who might be disrupted by eliminating old property names. Review by community. git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@21014 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
parent
34b106dabf
commit
ae4523fb45
37
build.xml
37
build.xml
|
@ -147,7 +147,7 @@ PROPERTIES
|
|||
<property name="lib.dir" value="${basedir}/lib"/>
|
||||
<property name="lib-ant.dir" value="${lib.dir}/ant"/>
|
||||
<property name="src.dir" value="${basedir}/src"/>
|
||||
<property name="test.dir" value="${basedir}/test"/>
|
||||
<property name="partest.dir" value="${basedir}/test"/>
|
||||
|
||||
<!-- Loads custom properties definitions -->
|
||||
<property file="${basedir}/build.properties"/>
|
||||
|
@ -161,6 +161,7 @@ PROPERTIES
|
|||
<property name="comp.starr.jar" value="${lib.dir}/scala-compiler.jar"/>
|
||||
<property name="jline.jar" value="${lib.dir}/jline.jar"/>
|
||||
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
|
||||
<property name="scalacheck.jar" value="${lib.dir}/ScalaCheck.jar"/>
|
||||
|
||||
<!-- Sets location of build folders -->
|
||||
<property name="build.dir" value="${basedir}/build"/>
|
||||
|
@ -1398,9 +1399,9 @@ BOOTRAPING TEST AND TEST SUITE
|
|||
scalacopts="${scalac.args.optimise}">
|
||||
<classpath>
|
||||
<path refid="pack.classpath"/>
|
||||
<fileset dir="${test.dir}/files/lib" includes="*.jar"/>
|
||||
<fileset dir="${partest.dir}/files/lib" includes="*.jar"/>
|
||||
</classpath>
|
||||
<runtests dir="${test.dir}/files">
|
||||
<runtests dir="${partest.dir}/files">
|
||||
<include name="run/**/*.scala"/>
|
||||
<include name="jvm/**/*.scala"/>
|
||||
</runtests>
|
||||
|
@ -1413,20 +1414,20 @@ BOOTRAPING TEST AND TEST SUITE
|
|||
scalacopts="${scalac.args.optimise}">
|
||||
<classpath>
|
||||
<path refid="pack.classpath"/>
|
||||
<fileset dir="${test.dir}/files/lib" includes="*.jar"/>
|
||||
<fileset dir="${partest.dir}/files/lib" includes="*.jar"/>
|
||||
</classpath>
|
||||
<postests dir="${test.dir}/files/pos" includes="*.scala"/>
|
||||
<negtests dir="${test.dir}/files/neg" includes="*.scala"/>
|
||||
<runtests dir="${test.dir}/files">
|
||||
<postests dir="${partest.dir}/files/pos" includes="*.scala"/>
|
||||
<negtests dir="${partest.dir}/files/neg" includes="*.scala"/>
|
||||
<runtests dir="${partest.dir}/files">
|
||||
<include name="run/**/*.scala"/>
|
||||
</runtests>
|
||||
<jvmtests dir="${test.dir}/files/jvm" includes="*.scala"/>
|
||||
<residenttests dir="${test.dir}/files/res" includes="*.res"/>
|
||||
<buildmanagertests dir="${test.dir}/files/buildmanager" includes="*"/>
|
||||
<shootouttests dir="${test.dir}/files/shootout" includes="*.scala"/>
|
||||
<scalaptests dir="${test.dir}/files/scalap" includes="**/*.scala"/>
|
||||
<!-- <scalachecktests dir="${test.dir}/files/scalacheck" includes="**/*.scala"/> -->
|
||||
<!-- <scripttests dir="${test.dir}/files/script" includes="*.scala"/> -->
|
||||
<jvmtests dir="${partest.dir}/files/jvm" includes="*.scala"/>
|
||||
<scalachecktests dir="${partest.dir}/files/scalacheck" includes="**/*.scala"/>
|
||||
<residenttests dir="${partest.dir}/files/res" includes="*.res"/>
|
||||
<buildmanagertests dir="${partest.dir}/files/buildmanager" includes="*"/>
|
||||
<shootouttests dir="${partest.dir}/files/shootout" includes="*.scala"/>
|
||||
<scalaptests dir="${partest.dir}/files/scalap" includes="**/*.scala"/>
|
||||
<!-- <scripttests dir="${partest.dir}/files/script" includes="*.scala"/> -->
|
||||
</partest>
|
||||
</target>
|
||||
|
||||
|
@ -1635,7 +1636,7 @@ POSITIONS
|
|||
|
||||
<target name="test.positions" depends="quick.comp">
|
||||
<antcall target="test.positions.tests.sub" inheritRefs="true">
|
||||
<param name="test.tests.srcs" value="${test.dir}/files/positions"/>
|
||||
<param name="test.tests.srcs" value="${partest.dir}/files/positions"/>
|
||||
</antcall>
|
||||
<antcall target="test.positions.sub" inheritRefs="true">
|
||||
<param name="test.srcs" value="${src.dir}/compiler"/>
|
||||
|
@ -1659,13 +1660,13 @@ POSITIONS
|
|||
<param name="test.srcs" value="${src.dir}/scalap"/>
|
||||
</antcall>
|
||||
<antcall target="test.positions.tests.sub" inheritRefs="true">
|
||||
<param name="test.tests.srcs" value="${test.dir}/files/pos"/>
|
||||
<param name="test.tests.srcs" value="${partest.dir}/files/pos"/>
|
||||
</antcall>
|
||||
<antcall target="test.positions.tests.sub" inheritRefs="true">
|
||||
<param name="test.tests.srcs" value="${test.dir}/files/run"/>
|
||||
<param name="test.tests.srcs" value="${partest.dir}/files/run"/>
|
||||
</antcall>
|
||||
<antcall target="test.positions.tests.sub" inheritRefs="true">
|
||||
<param name="test.tests.srcs" value="${test.dir}/files/neg"/>
|
||||
<param name="test.tests.srcs" value="${partest.dir}/files/neg"/>
|
||||
</antcall>
|
||||
</target>
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
How partest choses the compiler / library:
|
||||
|
||||
* ''-Dscalatest.build=build/four-pack'' -> will search for libraries in
|
||||
* ''-Dpartest.build=build/four-pack'' -> will search for libraries in
|
||||
''lib'' directory of given path
|
||||
* ''--pack'' -> will set ''scalatest.build=build/pack'', and run all tests.
|
||||
* ''--pack'' -> will set ''partest.build=build/pack'', and run all tests.
|
||||
add ''--[kind]'' to run a selected set of tests.
|
||||
* auto detection:
|
||||
- scalatest.build property -> ''bin'' / ''lib'' directories
|
||||
- partest.build property -> ''bin'' / ''lib'' directories
|
||||
- distribution (''dists/latest'')
|
||||
- supersabbus pack (''build/pack'')
|
||||
- sabbus quick (''build/quick'')
|
||||
|
@ -27,6 +27,6 @@ Other arguments:
|
|||
* --buildmanager next files test the build manager
|
||||
* --shootout next files are shootout tests
|
||||
* --script next files test the script runner
|
||||
* ''-Dscalatest.scalac_opts=...'' -> add compiler options
|
||||
* ''-Dpartest.scalac_opts=...'' -> add compiler options
|
||||
* ''--verbose'' -> print verbose messages
|
||||
* ''-Dpartest.debug=true'' -> print debug messages
|
||||
|
|
|
@ -12,6 +12,7 @@ package scala.tools.partest
|
|||
package nest
|
||||
|
||||
import java.io.File
|
||||
import scala.tools.nsc.io.{ Directory }
|
||||
|
||||
class AntRunner extends DirectRunner {
|
||||
|
||||
|
@ -20,7 +21,8 @@ class AntRunner extends DirectRunner {
|
|||
var JAVAC_CMD: String = "javac"
|
||||
var CLASSPATH: String = _
|
||||
var LATEST_LIB: String = _
|
||||
val TESTROOT: String = ""
|
||||
val testRootPath: String = "test"
|
||||
val testRootDir: Directory = Directory(testRootPath)
|
||||
}
|
||||
|
||||
def reflectiveRunTestsForFiles(kindFiles: Array[File], kind: String) =
|
||||
|
|
|
@ -65,7 +65,7 @@ class DirectCompiler(val fileManager: FileManager) extends SimpleCompiler {
|
|||
val args = (path substring 9 split pathSeparator).toList
|
||||
val plugins = args map (arg =>
|
||||
if (new File(arg).isAbsolute) arg
|
||||
else fileManager.TESTROOT+File.separator+arg
|
||||
else fileManager.testRootPath+File.separator+arg
|
||||
)
|
||||
plugins
|
||||
}
|
||||
|
|
|
@ -51,25 +51,22 @@ class ConsoleFileManager extends FileManager {
|
|||
SCALAC_OPTS = SCALAC_OPTS+" "+moreOpts
|
||||
}
|
||||
|
||||
val testRootDir = PathSettings.testRoot
|
||||
val srcDir = PathSettings.srcDir
|
||||
val srcDir = PathSettings.srcDir
|
||||
val testRootDir = PathSettings.testRoot
|
||||
val testRootPath = testRootDir.toAbsolute.path
|
||||
def testParent = testRootDir.parent
|
||||
|
||||
var CLASSPATH = PartestDefaults.classPath
|
||||
var JAVACMD = PartestDefaults.javaCmd
|
||||
var JAVAC_CMD = PartestDefaults.javacCmd
|
||||
val TESTROOT = testRootDir.toAbsolute.path
|
||||
|
||||
def testParent = testRootDir.parent
|
||||
|
||||
NestUI.verbose("CLASSPATH: "+CLASSPATH)
|
||||
|
||||
|
||||
if (!srcDir.isDirectory) {
|
||||
NestUI.failure("Source directory \"" + srcDir.path + "\" not found")
|
||||
exit(1)
|
||||
}
|
||||
|
||||
LIB_DIR = (testParent / "lib").normalize.path
|
||||
|
||||
CLASSPATH = {
|
||||
val libs = (srcDir / Directory("lib")).files filter (_ hasExtension "jar") map (_.normalize.path)
|
||||
|
|
|
@ -32,15 +32,15 @@ trait FileManager {
|
|||
val res = diffWriter.toString
|
||||
if (res startsWith "No") "" else res
|
||||
}
|
||||
|
||||
def testRootDir: Directory
|
||||
def testRootPath: String
|
||||
|
||||
var JAVACMD: String
|
||||
var JAVAC_CMD: String
|
||||
|
||||
var CLASSPATH: String
|
||||
var LATEST_LIB: String
|
||||
var LIB_DIR: String = ""
|
||||
|
||||
val TESTROOT: String
|
||||
|
||||
var showDiff = false
|
||||
var showLog = false
|
||||
|
|
|
@ -139,9 +139,9 @@ class Worker(val fileManager: FileManager) extends Actor {
|
|||
// fileManager.synchronized {
|
||||
// withOutputRedirected(logWriter) {
|
||||
// System.setProperty("java.library.path", logFile.getParentFile.getCanonicalFile.getAbsolutePath)
|
||||
// System.setProperty("scalatest.output", outDir.getCanonicalFile.getAbsolutePath)
|
||||
// System.setProperty("scalatest.lib", LATEST_LIB)
|
||||
// System.setProperty("scalatest.cwd", outDir.getParent)
|
||||
// System.setProperty("partest.output", outDir.getCanonicalFile.getAbsolutePath)
|
||||
// System.setProperty("partest.lib", LATEST_LIB)
|
||||
// System.setProperty("partest.cwd", outDir.getParent)
|
||||
// ObjectRunner.run(classpath, "Test", List("jvm"))
|
||||
// }
|
||||
// }
|
||||
|
@ -234,15 +234,15 @@ class Worker(val fileManager: FileManager) extends Actor {
|
|||
// because when an option is repeated to java only the last one wins.
|
||||
// That means until now all the .javaopts files were being ignored because
|
||||
// they all attempt to change options which are also defined in
|
||||
// scalatest.java_opts, leading to debug output like:
|
||||
// partest.java_opts, leading to debug output like:
|
||||
//
|
||||
// debug: Found javaopts file 'files/shootout/message.scala-2.javaopts', using options: '-Xss32k'
|
||||
// debug: java -Xss32k -Xss2m -Xms256M -Xmx1024M -classpath [...]
|
||||
val propertyOptions = List(
|
||||
"-Djava.library.path="+logFile.getParentFile.getAbsolutePath,
|
||||
"-Dscalatest.output="+outDir.getAbsolutePath,
|
||||
"-Dscalatest.lib="+LATEST_LIB,
|
||||
"-Dscalatest.cwd="+outDir.getParent,
|
||||
"-Dpartest.output="+outDir.getAbsolutePath,
|
||||
"-Dpartest.lib="+LATEST_LIB,
|
||||
"-Dpartest.cwd="+outDir.getParent,
|
||||
"-Djavacmd="+JAVACMD,
|
||||
"-Duser.language=en -Duser.country=US"
|
||||
) ::: (
|
||||
|
@ -452,8 +452,7 @@ class Worker(val fileManager: FileManager) extends Actor {
|
|||
|
||||
NestUI.verbose("compilation of "+file+" succeeded\n")
|
||||
|
||||
val libs = new File(fileManager.LIB_DIR)
|
||||
val scalacheckURL = (new File(libs, "ScalaCheck.jar")).toURI.toURL
|
||||
val scalacheckURL = (fileManager.testRootDir.parent / "lib" / "ScalaCheck.jar").toURL
|
||||
val outURL = outDir.getCanonicalFile.toURI.toURL
|
||||
val classpath: List[URL] =
|
||||
List(outURL, scalacheckURL, latestCompFile.toURI.toURL, latestLibFile.toURI.toURL, latestPartestFile.toURI.toURL).distinct
|
||||
|
|
|
@ -22,20 +22,20 @@ package object partest {
|
|||
private def wrapAccessControl[T](body: => Option[T]): Option[T] =
|
||||
try body catch { case _: java.security.AccessControlException => None }
|
||||
|
||||
def testRootName = propOrNone("scalatest.root")
|
||||
def testRootName = propOrNone("partest.root")
|
||||
def srcDirName = propOrElse("partest.srcdir", "files")
|
||||
def testRootDir = testRootName map (x => Directory(x))
|
||||
|
||||
def classPath = PathResolver.Environment.javaUserClassPath // XXX
|
||||
|
||||
def javaCmd = propOrElse("scalatest.javacmd", "java")
|
||||
def javacCmd = propOrElse("scalatest.javac_cmd", "javac")
|
||||
def javaOpts = propOrElse("scalatest.java_opts", "")
|
||||
def scalacOpts = propOrElse("scalatest.scalac_opts", "-deprecation")
|
||||
def javaCmd = propOrElse("partest.javacmd", "java")
|
||||
def javacCmd = propOrElse("partest.javac_cmd", "javac")
|
||||
def javaOpts = propOrElse("partest.java_opts", "")
|
||||
def scalacOpts = propOrElse("partest.scalac_opts", "-deprecation")
|
||||
|
||||
def testBuild = propOrNone("scalatest.build")
|
||||
def errorCount = propOrElse("scalatest.errors", "0").toInt
|
||||
def numActors = propOrElse("scalatest.actors", "8").toInt
|
||||
def testBuild = propOrNone("partest.build")
|
||||
def errorCount = propOrElse("partest.errors", "0").toInt
|
||||
def numActors = propOrElse("partest.actors", "8").toInt
|
||||
def poolSize = wrapAccessControl(propOrNone("actors.corePoolSize"))
|
||||
|
||||
def timeout = "1200000"
|
||||
|
@ -56,5 +56,5 @@ package object partest {
|
|||
NestUI.verbose(allPropertiesString)
|
||||
}
|
||||
|
||||
def isPartestDebug = List("partest.debug", "scalatest.debug") map propOrEmpty contains "true"
|
||||
def isPartestDebug = propOrEmpty("partest.debug") == "true"
|
||||
}
|
|
@ -10,7 +10,7 @@ object Test {
|
|||
def main(args: Array[String]) {
|
||||
// overwrites value of UrlContext.generator in file DocUtil.scala
|
||||
System.setProperty("doc.generator", "scaladoc")
|
||||
var dirname = System.getProperty("scalatest.output")
|
||||
var dirname = System.getProperty("partest.output")
|
||||
if (dirname eq null) dirname = System.getProperty("java.io.tmpdir")
|
||||
val tmpDir = new File(dirname)
|
||||
tmpDir.mkdirs()
|
||||
|
|
|
@ -53,8 +53,8 @@ class A {
|
|||
}
|
||||
|
||||
object Scalatest {
|
||||
private val outputdir = System.getProperty("scalatest.output", "inner-jvm.obj")
|
||||
private val scalalib = System.getProperty("scalatest.lib", "")
|
||||
private val outputdir = System.getProperty("partest.output", "inner-jvm.obj")
|
||||
private val scalalib = System.getProperty("partest.lib", "")
|
||||
private val classpath = outputdir + File.pathSeparator + scalalib
|
||||
private val javabin = {
|
||||
val jhome = new File(System.getProperty("java.home"))
|
||||
|
|
|
@ -3,7 +3,7 @@ import io.Path
|
|||
|
||||
object Test
|
||||
{
|
||||
val cwd = Option(System.getProperty("scalatest.cwd")) getOrElse "."
|
||||
val cwd = Option(System.getProperty("partest.cwd")) getOrElse "."
|
||||
val basedir = (Path(cwd).parent / "lib").path
|
||||
val baseargs = Array("-bootclasspath", basedir + "/scala-library.jar", "-cp", basedir + "/scala-compiler.jar")
|
||||
|
||||
|
|
|
@ -2,16 +2,36 @@ import org.scalacheck._
|
|||
import Prop._
|
||||
import Gen._
|
||||
|
||||
object Test extends Properties("==") {
|
||||
property("reflexive") = forAll { (x: AnyVal, y: AnyVal) => (x == y) == (y == x) }
|
||||
// property("hashCode") = forAll { (x
|
||||
object Test extends Properties("==") {
|
||||
def equalObjectsEqualHashcodes(x: Any, y: Any) = (x != y) || (x == y && x.## == y.##)
|
||||
|
||||
// ticket #2087
|
||||
property("short/char") = forAll { (x: Short) => {
|
||||
val ch: Char = x.toChar
|
||||
(x == ch) == (ch == x) ||
|
||||
// that's the whole test once it works, but since it doesn't yet:
|
||||
x < 0
|
||||
(x == ch) == (ch == x)
|
||||
}
|
||||
}
|
||||
|
||||
property("symmetry") = forAll { (x: AnyVal, y: AnyVal) => (x == y) == (y == x) }
|
||||
property("transitivity") = forAll { (x: AnyVal, y: AnyVal, z: AnyVal) => x != y || y != z || x == z }
|
||||
|
||||
property("##") = forAll {
|
||||
(x: Short) => {
|
||||
val anyvals = List(x.toByte, x.toChar, x, x.toInt, x.toLong, x.toFloat, x.toDouble, BigInt(x), BigDecimal(x))
|
||||
val shortAndLarger = anyvals drop 2
|
||||
|
||||
val result = (
|
||||
((anyvals, anyvals).zipped forall equalObjectsEqualHashcodes) &&
|
||||
((shortAndLarger, shortAndLarger).zipped forall (_ == _)) &&
|
||||
((shortAndLarger, shortAndLarger).zipped forall ((x, y) => (x: Any) == (y: Any)))
|
||||
)
|
||||
result
|
||||
}
|
||||
}
|
||||
property("## 2") = forAll {
|
||||
(dv: Double) => {
|
||||
val fv = dv.toFloat
|
||||
(fv != dv) || (fv.## == dv.##)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -76,7 +76,7 @@ methcall object Test extends Application {
|
|||
}
|
||||
moments object Test extends Application {
|
||||
for(val n <- List(25,75,125,200)) {
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("scalatest.cwd")+"/moments-input"+n+".txt"))
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("partest.cwd")+"/moments-input"+n+".txt"))
|
||||
moments.main(Array(n.toString))
|
||||
}
|
||||
}
|
||||
|
@ -119,20 +119,20 @@ recursive object Test extends Application {
|
|||
}
|
||||
regexdna object Test extends Application {
|
||||
for(val n <- List(100000,300000,500000)) {
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("scalatest.cwd")+"/regexdna-input"+n+".txt"))
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("partest.cwd")+"/regexdna-input"+n+".txt"))
|
||||
regexdna.main(Array(n.toString))
|
||||
}
|
||||
}
|
||||
regexmatch object Test extends Application {
|
||||
for(val n <- List(100,6000,9000,12000)) {
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("scalatest.cwd")+"/regexmatch-input"+n+".txt"))
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("partest.cwd")+"/regexmatch-input"+n+".txt"))
|
||||
regexmatch.main(Array(n.toString))
|
||||
}
|
||||
}
|
||||
|
||||
revcomp object Test extends Application {
|
||||
for(val n <- List(25000,250000,2500000)) {
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("scalatest.cwd")+"/revcomp-input"+n+".txt"))
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("partest.cwd")+"/revcomp-input"+n+".txt"))
|
||||
revcomp.main(Array(n.toString))
|
||||
}
|
||||
}
|
||||
|
@ -155,7 +155,7 @@ spellcheck inputfile=../../website/desc/spellcheck-input.txt
|
|||
|
||||
object Test extends Application {
|
||||
for(val n <- List(2500,25000,250000)) {
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("scalatest.cwd")+"/knucleotide-input"+n+".txt"))
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("partest.cwd")+"/knucleotide-input"+n+".txt"))
|
||||
knucleotide.main(Array(n.toString))
|
||||
}
|
||||
}
|
||||
|
@ -165,7 +165,7 @@ strcat object Test extends Application {
|
|||
}
|
||||
sumcol object Test extends Application {
|
||||
for(val n <- List(400,700,1000,8000)) {
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("scalatest.cwd")+"/sumcol-input"+n+".txt"))
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("partest.cwd")+"/sumcol-input"+n+".txt"))
|
||||
sumcol.main(Array(n.toString))
|
||||
}
|
||||
}
|
||||
|
@ -196,7 +196,7 @@ wordfreq inputfile=../../website/desc/wordfreq-input.txt
|
|||
|
||||
object Test extends Application {
|
||||
for(val n <- List(2500,25000,250000)) {
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("scalatest.cwd")+"/knucleotide-input"+n+".txt"))
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("partest.cwd")+"/knucleotide-input"+n+".txt"))
|
||||
knucleotide.main(Array(n.toString))
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
object Test extends Application {
|
||||
for(val n <- List(2500,25000,250000)) {
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("scalatest.cwd")+"/knucleotide-input"+n+".txt"))
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("partest.cwd")+"/knucleotide-input"+n+".txt"))
|
||||
knucleotide.main(Array(n.toString))
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
object Test extends Application {
|
||||
for(val n <- List(2500,25000,250000)) {
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("scalatest.cwd")+"/knucleotide-input"+n+".txt"))
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("partest.cwd")+"/knucleotide-input"+n+".txt"))
|
||||
knucleotide.main(Array(n.toString))
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
object Test extends Application {
|
||||
val base = System.getProperty("scalatest.cwd")+java.io.File.separator+"regexdna-input"
|
||||
val base = System.getProperty("partest.cwd")+java.io.File.separator+"regexdna-input"
|
||||
for (n <- List(100000,300000,500000)) {
|
||||
System.setIn(new java.io.FileInputStream(base+n+".txt"))
|
||||
regexdna.main(Array(n.toString))
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
object Test extends Application {
|
||||
for(val n <- List(400,700,1000,8000)) {
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("scalatest.cwd")+"/sumcol-input.txt"))
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("partest.cwd")+"/sumcol-input.txt"))
|
||||
sumcol.main(Array(n.toString))
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
object Test extends Application {
|
||||
for(val n <- List(400,700,1000,8000)) {
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("scalatest.cwd")+"/sumcol-input.txt"))
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("partest.cwd")+"/sumcol-input.txt"))
|
||||
sumcol.main(Array(n.toString))
|
||||
}
|
||||
}
|
||||
|
|
|
@ -83,4 +83,4 @@ if [ ! -z "${PARTEST_DEBUG}" ] ; then
|
|||
partestDebugStr="-Dpartest.debug=${PARTEST_DEBUG}"
|
||||
fi
|
||||
|
||||
${JAVACMD:=java} $JAVA_OPTS -cp "$EXT_CLASSPATH" ${partestDebugStr} -Dscala.home="${SCALA_HOME}" -Dscalatest.javacmd="${JAVACMD}" -Dscalatest.java_opts="${JAVA_OPTS}" -Dscalatest.scalac_opts="${SCALAC_OPTS}" -Dscalatest.javac_cmd="${JAVA_HOME}/bin/javac" scala.tools.partest.nest.NestRunner "$@"
|
||||
${JAVACMD:=java} $JAVA_OPTS -cp "$EXT_CLASSPATH" ${partestDebugStr} -Dscala.home="${SCALA_HOME}" -Dpartest.javacmd="${JAVACMD}" -Dpartest.java_opts="${JAVA_OPTS}" -Dpartest.scalac_opts="${SCALAC_OPTS}" -Dpartest.javac_cmd="${JAVA_HOME}/bin/javac" scala.tools.partest.nest.NestRunner "$@"
|
||||
|
|
|
@ -53,7 +53,7 @@ if "%_EXTENSION_CLASSPATH%"=="" (
|
|||
)
|
||||
)
|
||||
|
||||
set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dscalatest.javacmd="%_JAVACMD%" -Dscalatest.java_options="%_JAVA_OPTS%" -Dscalatest.scalac_options="%_SCALAC_OPTS%" -Dscalatest.javac_cmd="%JAVA_HOME%\bin\javac"
|
||||
set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dpartest.javacmd="%_JAVACMD%" -Dpartest.java_options="%_JAVA_OPTS%" -Dpartest.scalac_options="%_SCALAC_OPTS%" -Dpartest.javac_cmd="%JAVA_HOME%\bin\javac"
|
||||
|
||||
rem echo %_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS%
|
||||
%_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS%
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
object Test extends Application {
|
||||
for(val n <- List(25000,250000,2500000)) {
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("scalatest.cwd")+"/revcomp-input"+n+".txt"))
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("partest.cwd")+"/revcomp-input"+n+".txt"))
|
||||
revcomp.main(Array(n.toString))
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
object Test extends Application {
|
||||
for(val n <- List(25000,250000,2500000)) {
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("scalatest.cwd")+"/revcomp-input"+n+".txt"))
|
||||
System.setIn(new java.io.FileInputStream(System.getProperty("partest.cwd")+"/revcomp-input"+n+".txt"))
|
||||
revcomp.main(Array(n.toString))
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue