From e74cce036a7e9f8a08a020f1e007b22098db890d Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Tue, 12 May 2015 15:19:55 -0700
Subject: Use CHISEL_BIN, CX, generalize generated/targetDir, convert filter to
 python, cd into targetDir before launching simulator (via Driver).

---
 src/main/scala/Chisel/Tester.scala | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

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()
-- 
cgit v1.2.3