From 6e03f63d525aac0bdf4a59b6fe66a0b4d5a3a25a Mon Sep 17 00:00:00 2001
From: Schuyler Eldridge
Date: Tue, 16 Jun 2020 11:59:15 -0400
Subject: Use ChiselStage in Tests

This migrates the tests to Chisel 3.4/FIRRTL 1.4. This primarily
involves removing usages of deprecated methods including:

- Remove usages of Driver
- Use ChiselStage methods instead of BackendCompilationUtilities
  methods
- Use Dependency API for custom transforms
- Use extractCause to unpack StackError

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
---
 src/test/scala/chiselTests/RawModuleSpec.scala | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/test/scala/chiselTests/RawModuleSpec.scala')

diff --git a/src/test/scala/chiselTests/RawModuleSpec.scala b/src/test/scala/chiselTests/RawModuleSpec.scala
index 45d6b58a..192e66a3 100644
--- a/src/test/scala/chiselTests/RawModuleSpec.scala
+++ b/src/test/scala/chiselTests/RawModuleSpec.scala
@@ -3,6 +3,7 @@
 package chiselTests
 
 import chisel3._
+import chisel3.stage.ChiselStage
 import chisel3.testers.BasicTester
 
 class UnclockedPlusOne extends RawModule {
@@ -58,9 +59,9 @@ class ImplicitModuleDirectlyInRawModuleTester extends BasicTester {
   stop()
 }
 
-class RawModuleSpec extends ChiselFlatSpec {
+class RawModuleSpec extends ChiselFlatSpec with Utils {
   "RawModule" should "elaborate" in {
-    elaborate { new RawModuleWithImplicitModule }
+    ChiselStage.elaborate { new RawModuleWithImplicitModule }
   }
 
   "RawModule" should "work" in {
@@ -74,13 +75,17 @@ class RawModuleSpec extends ChiselFlatSpec {
 
   "ImplicitModule directly in a RawModule" should "fail" in {
     intercept[chisel3.internal.ChiselException] {
-      elaborate { new RawModuleWithDirectImplicitModule }
+      extractCause[ChiselException] {
+        ChiselStage.elaborate { new RawModuleWithDirectImplicitModule }
+      }
     }
   }
 
   "ImplicitModule directly in a RawModule in an ImplicitModule" should "fail" in {
     intercept[chisel3.internal.ChiselException] {
-      elaborate { new ImplicitModuleDirectlyInRawModuleTester }
+      extractCause[ChiselException] {
+        ChiselStage.elaborate { new ImplicitModuleDirectlyInRawModuleTester }
+      }
     }
   }
 }
-- 
cgit v1.2.3