From 55e5c425e90e56cdcb371b19576388ef5ea3c3bc Mon Sep 17 00:00:00 2001
From: Eren Dogan <work@edogan.us>
Date: Sat, 20 Jan 2024 08:38:18 -0800
Subject: [PATCH] Fix same file error and enable passing tests

---
 compiler/characterizer/functional.py |  5 ++++-
 compiler/tests/Makefile              | 19 +++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/compiler/characterizer/functional.py b/compiler/characterizer/functional.py
index 69183362..970f69f8 100644
--- a/compiler/characterizer/functional.py
+++ b/compiler/characterizer/functional.py
@@ -45,7 +45,10 @@ class functional(simulation):
             sram.sp_write(self.sp_file, trim=OPTS.trim_netlist)
         # Copy sp file to temp dir
         self.temp_spice = path.join(OPTS.openram_temp, "sram.sp")
-        shutil.copy(self.sp_file, self.temp_spice)
+        try:
+            shutil.copy(self.sp_file, self.temp_spice)
+        except shutil.SameFileError: # skip if the same
+            pass
 
         if not corner:
             corner = (OPTS.process_corners[0], OPTS.supply_voltages[0], OPTS.temperatures[0])
diff --git a/compiler/tests/Makefile b/compiler/tests/Makefile
index c8bbae5a..ccca67b1 100644
--- a/compiler/tests/Makefile
+++ b/compiler/tests/Makefile
@@ -25,18 +25,6 @@ BROKEN_STAMPS = \
 	%/19_single_bank_16mux_test.ok \
 	%/20_sram_1bank_16mux_1rw_1r_test.ok \
 	%/21_xyce_delay_test.ok \
-	%/22_psram_1bank_2mux_func_test.ok \
-	%/22_psram_1bank_4mux_func_test.ok \
-	%/22_psram_1bank_8mux_func_test.ok \
-	%/22_psram_1bank_nomux_func_test.ok \
-	%/22_sram_1bank_2mux_func_test.ok \
-	%/22_sram_1bank_2mux_global_func_test.ok \
-	%/22_sram_1bank_4mux_func_test.ok \
-	%/22_sram_1bank_8mux_func_test.ok \
-	%/22_sram_1bank_nomux_1rw_1r_func_test.ok \
-	%/22_sram_1bank_nomux_func_test.ok \
-	%/22_sram_1bank_wmask_1rw_1r_func_test.ok \
-	%/22_sram_wmask_func_test.ok \
 	%/27_verilog_multibank_test.ok \
 	freepdk45/04_rom_address_control_buf_test.ok \
 	freepdk45/05_rom_array_test.ok \
@@ -129,6 +117,13 @@ BROKEN_STAMPS = \
 	sky130/21_ngspice_delay_extra_rows_test.ok \
 	sky130/21_ngspice_delay_test.ok \
 	sky130/21_regression_delay_test.ok \
+	sky130/22_psram_1bank_2mux_func_test.ok \
+	sky130/22_psram_1bank_4mux_func_test.ok \
+	sky130/22_psram_1bank_8mux_func_test.ok \
+	sky130/22_psram_1bank_nomux_func_test.ok \
+	sky130/22_sram_1bank_2mux_global_func_test.ok \
+	sky130/22_sram_1bank_wmask_1rw_1r_func_test.ok \
+	sky130/22_sram_wmask_func_test.ok \
 	sky130/23_lib_sram_linear_regression_test.ok \
 	sky130/23_lib_sram_model_corners_test.ok \
 	sky130/23_lib_sram_model_test.ok \