diff options
| author | Chick Markley | 2016-11-07 13:56:02 -0800 |
|---|---|---|
| committer | Jack Koenig | 2016-11-07 13:56:02 -0800 |
| commit | 907a2b2bff7023316a29e129aa9cbc04ba794c06 (patch) | |
| tree | c7004f13fea4bec8311302ecb7812992592020ce /src | |
| parent | 8fe0dc625d33fd6b61aec86cdc2a62955411641f (diff) | |
make default dir be current directory (#361)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/scala/firrtl/ExecutionOptionsManager.scala | 2 | ||||
| -rw-r--r-- | src/test/scala/firrtlTests/DriverSpec.scala | 14 | ||||
| -rw-r--r-- | src/test/scala/firrtlTests/ExecutionOptionManagerSpec.scala | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/main/scala/firrtl/ExecutionOptionsManager.scala b/src/main/scala/firrtl/ExecutionOptionsManager.scala index 449b386f..ae0636d9 100644 --- a/src/main/scala/firrtl/ExecutionOptionsManager.scala +++ b/src/main/scala/firrtl/ExecutionOptionsManager.scala @@ -29,7 +29,7 @@ abstract class HasParser(applicationName: String) { */ case class CommonOptions( topName: String = "", - targetDirName: String = "test_run_dir", + targetDirName: String = ".", globalLogLevel: LogLevel.Value = LogLevel.Error, logToFile: Boolean = false, logClassNames: Boolean = false, diff --git a/src/test/scala/firrtlTests/DriverSpec.scala b/src/test/scala/firrtlTests/DriverSpec.scala index cb479225..3ff7bed3 100644 --- a/src/test/scala/firrtlTests/DriverSpec.scala +++ b/src/test/scala/firrtlTests/DriverSpec.scala @@ -19,7 +19,7 @@ class DriverSpec extends FreeSpec with Matchers { val commonOptions = optionsManager.commonOptions commonOptions.topName should be("") - commonOptions.targetDirName should be("test_run_dir") + commonOptions.targetDirName should be(".") } "top name and target can be set" in { val optionsManager = new ExecutionOptionsManager("test") @@ -55,7 +55,7 @@ class DriverSpec extends FreeSpec with Matchers { "FirrtlOptions holds option information for the firrtl compiler" - { "It includes a CommonOptions" in { val optionsManager = new ExecutionOptionsManager("test") - optionsManager.commonOptions.targetDirName should be ("test_run_dir") + optionsManager.commonOptions.targetDirName should be (".") } "It provides input and output file names based on target" in { val optionsManager = new ExecutionOptionsManager("test") with HasFirrtlOptions @@ -64,9 +64,9 @@ class DriverSpec extends FreeSpec with Matchers { val firrtlOptions = optionsManager.firrtlOptions val inputFileName = optionsManager.getBuildFileName("fir", firrtlOptions.inputFileNameOverride) - inputFileName should be ("test_run_dir/cat.fir") + inputFileName should be ("./cat.fir") val outputFileName = optionsManager.getBuildFileName("v", firrtlOptions.outputFileNameOverride) - outputFileName should be ("test_run_dir/cat.v") + outputFileName should be ("./cat.v") } "input and output file names can be overridden, overrides do not use targetDir" in { val optionsManager = new ExecutionOptionsManager("test") with HasFirrtlOptions @@ -138,9 +138,9 @@ class DriverSpec extends FreeSpec with Matchers { "compiler changes the default name of the output file" in { Seq( - "low" -> "test_run_dir/Dummy.lo.fir", - "high" -> "test_run_dir/Dummy.hi.fir", - "verilog" -> "test_run_dir/Dummy.v" + "low" -> "./Dummy.lo.fir", + "high" -> "./Dummy.hi.fir", + "verilog" -> "./Dummy.v" ).foreach { case (compilerName, expectedOutputFileName) => val manager = new ExecutionOptionsManager("test") with HasFirrtlOptions { commonOptions = CommonOptions(topName = "Dummy") diff --git a/src/test/scala/firrtlTests/ExecutionOptionManagerSpec.scala b/src/test/scala/firrtlTests/ExecutionOptionManagerSpec.scala index 0edef8cc..82e1412c 100644 --- a/src/test/scala/firrtlTests/ExecutionOptionManagerSpec.scala +++ b/src/test/scala/firrtlTests/ExecutionOptionManagerSpec.scala @@ -9,7 +9,7 @@ class ExecutionOptionManagerSpec extends FreeSpec with Matchers { "ExecutionOptionManager is a container for one more more ComposableOptions Block" - { "It has a default CommonOptionsBlock" in { val manager = new ExecutionOptionsManager("test") - manager.commonOptions.targetDirName should be ("test_run_dir") + manager.commonOptions.targetDirName should be (".") } "But can override defaults like this" in { val manager = new ExecutionOptionsManager("test") { commonOptions = CommonOptions(topName = "dog") } |
