summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorjackkoenig2016-03-18 01:02:56 -0700
committerjackkoenig2016-03-18 01:02:56 -0700
commit8e15bd90e179be15145ca3b04b8a4498fc0a9b73 (patch)
treea3c3a07c358a2e595ea29ebf6aca478ee9bc1f20 /src/test
parente6ee1ddb79c219e313e530a029d8402274fbaebc (diff)
Only randomize directory names during testing
Diffstat (limited to 'src/test')
-rw-r--r--src/test/scala/chiselTests/Harness.scala23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/test/scala/chiselTests/Harness.scala b/src/test/scala/chiselTests/Harness.scala
index 1a628e6c..b06f4572 100644
--- a/src/test/scala/chiselTests/Harness.scala
+++ b/src/test/scala/chiselTests/Harness.scala
@@ -50,30 +50,29 @@ int main(int argc, char **argv, char **env) {
def simpleHarnessBackend(make: File => File): (File, String) = {
val target = "test"
val path = createTempDirectory(target)
- val fname = File.createTempFile(target, "", path)
- val prefix = fname.toString.split("/").last
+ val fname = new File(path, target)
val cppHarness = makeCppHarness(fname)
make(fname)
- verilogToCpp(prefix, path, Seq(), cppHarness).!
- cppToExe(prefix, path).!
- (path, prefix)
+ verilogToCpp(target, path, Seq(), cppHarness).!
+ cppToExe(target, path).!
+ (path, target)
}
property("Test making trivial verilog harness and executing") {
- val (path, prefix) = simpleHarnessBackend(makeTrivialVerilog)
+ val (path, target) = simpleHarnessBackend(makeTrivialVerilog)
- assert(executeExpectingSuccess(prefix, path))
+ assert(executeExpectingSuccess(target, path))
}
property("Test that assertion failues in Verilog are caught") {
- val (path, prefix) = simpleHarnessBackend(makeFailingVerilog)
+ val (path, target) = simpleHarnessBackend(makeFailingVerilog)
- assert(!executeExpectingSuccess(prefix, path))
- assert(executeExpectingFailure(prefix, path))
- assert(executeExpectingFailure(prefix, path, "My specific, expected error message!"))
- assert(!executeExpectingFailure(prefix, path, "A string that doesn't match any test output"))
+ assert(!executeExpectingSuccess(target, path))
+ assert(executeExpectingFailure(target, path))
+ assert(executeExpectingFailure(target, path, "My specific, expected error message!"))
+ assert(!executeExpectingFailure(target, path, "A string that doesn't match any test output"))
}
}