summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJim Lawson2015-05-12 15:19:55 -0700
committerJim Lawson2015-07-24 15:50:53 -0700
commite74cce036a7e9f8a08a020f1e007b22098db890d (patch)
treef15f841da5deb4ba6cbbad581ae7db35a809d461 /src
parent2ae50411cbc5e2cd5fdc9ca4069b9c5f64919bc4 (diff)
Use CHISEL_BIN, CX, generalize generated/targetDir, convert filter to python, cd into targetDir before launching simulator (via Driver).
Diffstat (limited to 'src')
-rw-r--r--src/main/scala/Chisel/Tester.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/scala/Chisel/Tester.scala b/src/main/scala/Chisel/Tester.scala
index bdeb0f68..cf7c7b1c 100644
--- a/src/main/scala/Chisel/Tester.scala
+++ b/src/main/scala/Chisel/Tester.scala
@@ -357,9 +357,9 @@ class ManualTester[+T <: Module]
def start(): Process = {
val n = Driver.appendString(Some(c.name),Driver.chiselConfigClassName)
- val target = Driver.targetDir + "/" + n
+ val target = "cd " + Driver.targetDir + " && ./" + n
val cmd = target
- println("OPENING " + cmd)
+ println("RUNNING " + cmd)
/*
(if (Driver.backend.isInstanceOf[FloBackend]) {
val dir = Driver.backend.asInstanceOf[FloBackend].floDir
@@ -373,8 +373,8 @@ class ManualTester[+T <: Module]
})
*/
println("SEED " + Driver.testerSeed)
- println("STARTING " + cmd)
- val processBuilder = Process(cmd)
+ println("STARTING " + n)
+ val processBuilder = Process(Seq("bash", "-c", cmd))
val pio = new ProcessIO(in => testOut = in, out => testIn = out, err => testErr = err)
process = processBuilder.run(pio)
waitForStreams()