From cdf01c6c239708ed5a5fefd7c3213bbfdb76c364 Mon Sep 17 00:00:00 2001
From: Matthew Guthaus <mrg@ucsc.edu>
Date: Sun, 17 Nov 2019 00:49:38 +0000
Subject: [PATCH] Fix test 30 for generic configs

---
 compiler/tests/30_openram_back_end_test.py  |  2 +-
 compiler/tests/30_openram_front_end_test.py |  2 +-
 compiler/tests/configs/config.py            | 11 ++++++++---
 compiler/tests/configs/config_back_end.py   | 12 +++++++++---
 compiler/tests/configs/config_front_end.py  | 12 +++++++++---
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/compiler/tests/30_openram_back_end_test.py b/compiler/tests/30_openram_back_end_test.py
index b3c35010..73d201b1 100755
--- a/compiler/tests/30_openram_back_end_test.py
+++ b/compiler/tests/30_openram_back_end_test.py
@@ -52,7 +52,7 @@ class openram_back_end_test(openram_test):
             exe_name = "{0}/openram.py ".format(OPENRAM_HOME)
         else:
             exe_name = "coverage run -p {0}/openram.py ".format(OPENRAM_HOME) 
-        config_name = "{0}/tests/{1}/config_back_end.py".format(OPENRAM_HOME,OPTS.tech_name)
+        config_name = "{0}/tests/configs/config_back_end.py".format(OPENRAM_HOME)
         cmd = "{0} -n -o {1} -p {2} {3} {4} 2>&1 > {5}/output.log".format(exe_name,
                                                                           out_file,
                                                                           out_path,
diff --git a/compiler/tests/30_openram_front_end_test.py b/compiler/tests/30_openram_front_end_test.py
index 8ed76627..3aec10f9 100755
--- a/compiler/tests/30_openram_front_end_test.py
+++ b/compiler/tests/30_openram_front_end_test.py
@@ -52,7 +52,7 @@ class openram_front_end_test(openram_test):
             exe_name = "{0}/openram.py ".format(OPENRAM_HOME)
         else:
             exe_name = "coverage run -p {0}/openram.py ".format(OPENRAM_HOME) 
-        config_name = "{0}/tests/{1}/config_front_end.py".format(OPENRAM_HOME,OPTS.tech_name)
+        config_name = "{0}/tests/configs/config_front_end.py".format(OPENRAM_HOME)
         cmd = "{0} -n -o {1} -p {2} {3} {4} 2>&1 > {5}/output.log".format(exe_name,
                                                                           out_file,
                                                                           out_path,
diff --git a/compiler/tests/configs/config.py b/compiler/tests/configs/config.py
index b43d2707..c420da33 100644
--- a/compiler/tests/configs/config.py
+++ b/compiler/tests/configs/config.py
@@ -17,7 +17,12 @@ temperatures = [25]
 route_supplies = True
 check_lvsdrc = True
 
-drc_name = "magic"
-lvs_name = "netgen"
-pex_name = "magic"
+if tech_name == "freepdk45":
+    drc_name = "calibre"
+    lvs_name = "calibre"
+    pex_name = "calibre"
+else:
+    drc_name = "magic"
+    lvs_name = "netgen"
+    pex_name = "magic"
 
diff --git a/compiler/tests/configs/config_back_end.py b/compiler/tests/configs/config_back_end.py
index 3ef6fae1..cc0a3e1e 100644
--- a/compiler/tests/configs/config_back_end.py
+++ b/compiler/tests/configs/config_back_end.py
@@ -19,6 +19,12 @@ check_lvsdrc = True
 inline_lvsdrc = True
 analytical_delay = False
 
-drc_name = "magic"
-lvs_name = "netgen"
-pex_name = "magic"
+if tech_name == "freepdk45":
+    drc_name = "calibre"
+    lvs_name = "calibre"
+    pex_name = "calibre"
+else:
+    drc_name = "magic"
+    lvs_name = "netgen"
+    pex_name = "magic"
+
diff --git a/compiler/tests/configs/config_front_end.py b/compiler/tests/configs/config_front_end.py
index 18bb1b3e..2b0f7e08 100644
--- a/compiler/tests/configs/config_front_end.py
+++ b/compiler/tests/configs/config_front_end.py
@@ -14,7 +14,13 @@ process_corners = ["TT"]
 supply_voltages = [5.0]
 temperatures = [25]
 
-drc_name = "magic"
-lvs_name = "netgen"
-pex_name = "magic"
+if tech_name == "freepdk45":
+    drc_name = "calibre"
+    lvs_name = "calibre"
+    pex_name = "calibre"
+else:
+    drc_name = "magic"
+    lvs_name = "netgen"
+    pex_name = "magic"
+