Permalink
Browse files

Merge remote-tracking branch 'origin/5.0.x'

Conflicts:
	headless/src/test/org/nlogo/headless/TestCompileBenchmarks.scala
	models
  • Loading branch information...
SethTisue committed Oct 10, 2012
2 parents 4a3a5a4 + 404392e commit 6d79728eb991a3341ff1ce1a147a520df33ee585
@@ -7,7 +7,7 @@ import org.nlogo.agent.Observer
import org.nlogo.api.SimpleJobOwner
// This is used by the "bench" target in the Makefile. You can __dump a compiled model
-// to stdout, or replace all of the benchmark model dumps in models/test/bench, or dump
+// to stdout, or replace all of the benchmark model dumps in test/benchdumps, or dump
// the whole models library to tmp/dumps. - ST 2/11/09
object Dump {
@@ -34,7 +34,7 @@ object Dump {
def benchPath(name:String) = "models/test/benchmarks/" + name + " Benchmark.nlogo"
def dumpBenchmarks() {
for(name <- ChecksumsAndPreviews.allBenchmarks)
- writeFile("models/test/bench/" + BranchName.branch + "/" + name + ".txt",
+ writeFile("test/benchdumps/" + name + ".txt",
dump(benchPath(name)))
}
def dumpAll() {
@@ -14,7 +14,7 @@ class TestCompileBenchmarks extends FunSuite with SlowTest{
"Team", "Termites", "VirusNet", "Wealth", "Wolf", "ImportWorld")
// this is here to help us remember that when the list of benchmarks changes, this file and the
- // contents of models/test/bench both need updating too - ST 2/11/09
+ // contents of test/benchdumps both need updating too - ST 2/11/09
test("names") {
assert(names.mkString("\n") === ChecksumsAndPreviews.allBenchmarks.mkString("\n"))
}
@@ -30,17 +30,8 @@ class TestCompileBenchmarks extends FunSuite with SlowTest{
result
}
val source =
- io.Source.fromFile("models/test/bench/" + BranchName.branch + "/" + name + ".txt")
+ io.Source.fromFile("test/benchdumps/" + name + ".txt")
assert(dump === source.getLines.mkString("","\n","\n"))
}
}
}
-
-object BranchName {
- // the benchmarks dumps may be different on some branches, but since the benchmark models aren't
- // open source, they're in a separate repo. so, in that separate repo, we have a "master"
- // directory with the dumps for the master branch here in the main repo, and for any branch here
- // which needs different dumps, there's a corresponding directory in the models repo.
- // A bit kludgy I guess, but it's OK. - ST 11/17/11
- val branch = "master"
-}
2 models
Submodule models updated from f4eed7 to 00e858
Oops, something went wrong.

0 comments on commit 6d79728

Please sign in to comment.