aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/test/resources/firrtl/testTop.cpp (renamed from src/test/resources/top.cpp)0
-rw-r--r--src/test/scala/firrtlTests/FirrtlSpec.scala6
-rw-r--r--src/test/scala/firrtlTests/IntegrationSpec.scala4
-rw-r--r--src/test/scala/firrtlTests/StringSpec.scala2
4 files changed, 7 insertions, 5 deletions
diff --git a/src/test/resources/top.cpp b/src/test/resources/firrtl/testTop.cpp
index ba27c917..ba27c917 100644
--- a/src/test/resources/top.cpp
+++ b/src/test/resources/firrtl/testTop.cpp
diff --git a/src/test/scala/firrtlTests/FirrtlSpec.scala b/src/test/scala/firrtlTests/FirrtlSpec.scala
index 6bf73a80..f77b47f3 100644
--- a/src/test/scala/firrtlTests/FirrtlSpec.scala
+++ b/src/test/scala/firrtlTests/FirrtlSpec.scala
@@ -16,7 +16,9 @@ import firrtl.annotations
import firrtl.util.BackendCompilationUtilities
trait FirrtlRunners extends BackendCompilationUtilities {
- lazy val cppHarness = new File(s"/top.cpp")
+
+ val cppHarnessResourceName: String = "/firrtl/testTop.cpp"
+
/** Compiles input Firrtl to Verilog */
def compileToVerilog(input: String, annotations: AnnotationMap = AnnotationMap(Seq.empty)): String = {
val circuit = Parser.parse(input.split("\n").toIterator)
@@ -64,7 +66,7 @@ trait FirrtlRunners extends BackendCompilationUtilities {
annotations: AnnotationMap = new AnnotationMap(Seq.empty)) = {
val testDir = compileFirrtlTest(prefix, srcDir, customTransforms, annotations)
val harness = new File(testDir, s"top.cpp")
- copyResourceToFile(cppHarness.toString, harness)
+ copyResourceToFile(cppHarnessResourceName, harness)
// Note file copying side effect
val verilogFiles = verilogPrefixes map { vprefix =>
diff --git a/src/test/scala/firrtlTests/IntegrationSpec.scala b/src/test/scala/firrtlTests/IntegrationSpec.scala
index f4173143..6ac45b6d 100644
--- a/src/test/scala/firrtlTests/IntegrationSpec.scala
+++ b/src/test/scala/firrtlTests/IntegrationSpec.scala
@@ -37,8 +37,8 @@ class GCDSplitEmissionExecutionTest extends FirrtlFlatSpec {
topFile should exist
// Copy harness over
- val harness = new File(testDir, s"top.cpp")
- copyResourceToFile(cppHarness.toString, harness)
+ val harness = new File(testDir, s"testTop.cpp")
+ copyResourceToFile(cppHarnessResourceName, harness)
// topFile will be compiled by Verilator command by default but we need to also include dutFile
verilogToCpp(top, testDir, Seq(dutFile), harness).!
diff --git a/src/test/scala/firrtlTests/StringSpec.scala b/src/test/scala/firrtlTests/StringSpec.scala
index b3f6523d..7e7c040e 100644
--- a/src/test/scala/firrtlTests/StringSpec.scala
+++ b/src/test/scala/firrtlTests/StringSpec.scala
@@ -18,7 +18,7 @@ class PrintfSpec extends FirrtlPropSpec {
val prefix = "Printf"
val testDir = compileFirrtlTest(prefix, "/features")
val harness = new File(testDir, s"top.cpp")
- copyResourceToFile(cppHarness.toString, harness)
+ copyResourceToFile(cppHarnessResourceName, harness)
verilogToCpp(prefix, testDir, Seq(), harness).!
cppToExe(prefix, testDir).!