From 54e67889f10b39323fb729808b8cd22b4c832910 Mon Sep 17 00:00:00 2001 From: chick Date: Thu, 1 Aug 2019 09:21:52 -0700 Subject: Followup to PR #1142 Fixes a threading bug in where lazy reading of file caused a problem for multithreaded access to the that was read. Changes all uses of io.Source to use new API getText getLines getTextResource getLinesResouce Make style to only import FileUtils and not its methods So code is more explicit as e.g. FileUtils.getText() --- src/test/scala/firrtlTests/MultiThreadingSpec.scala | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/test/scala/firrtlTests/MultiThreadingSpec.scala') diff --git a/src/test/scala/firrtlTests/MultiThreadingSpec.scala b/src/test/scala/firrtlTests/MultiThreadingSpec.scala index 444faebc..72c66e93 100644 --- a/src/test/scala/firrtlTests/MultiThreadingSpec.scala +++ b/src/test/scala/firrtlTests/MultiThreadingSpec.scala @@ -2,10 +2,11 @@ package firrtlTests -import firrtl.{ChirrtlForm, CircuitState, Compiler, annotations} +import firrtl.FileUtils +import firrtl.{ChirrtlForm, CircuitState} -import scala.concurrent.{Future, Await, ExecutionContext} import scala.concurrent.duration.Duration +import scala.concurrent.{Await, ExecutionContext, Future} class MultiThreadingSpec extends FirrtlPropSpec { @@ -27,8 +28,8 @@ class MultiThreadingSpec extends FirrtlPropSpec { val numThreads = 64 // arbitrary // Begin the actual test - val inputStream = getClass().getResourceAsStream(inputFilePath) - val inputStrings = io.Source.fromInputStream(inputStream).getLines().toList + + val inputStrings = FileUtils.getLinesResource(inputFilePath) import ExecutionContext.Implicits.global try { // Use try-catch because error can manifest in many ways -- cgit v1.2.3