From c4d2cb78ef1d49825c7675a5700616318e629fb2 Mon Sep 17 00:00:00 2001 From: Matt Guthaus Date: Fri, 18 Nov 2016 11:33:03 -0800 Subject: [PATCH] Relative gds file names in tests. --- compiler/router/tests/01_no_blockages_test.py | 9 +++++---- compiler/router/tests/02_blockages_test.py | 7 ++++--- compiler/router/tests/03_same_layer_pins_test.py | 7 ++++--- compiler/router/tests/04_diff_layer_pins_test.py | 7 ++++--- compiler/router/tests/05_two_nets_test.py | 7 ++++--- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/compiler/router/tests/01_no_blockages_test.py b/compiler/router/tests/01_no_blockages_test.py index 47e534e3..99a45645 100644 --- a/compiler/router/tests/01_no_blockages_test.py +++ b/compiler/router/tests/01_no_blockages_test.py @@ -27,8 +27,8 @@ class no_blockages_test(unittest.TestCase): #design.design.__init__(self, name) debug.info(2, "Create {0} object".format(name)) self.name = name - self.gds_file = name + ".gds" - self.sp_file = name + ".sp" + self.gds_file = "{0}/{1}.gds".format(os.path.dirname(os.path.realpath(__file__)),name) + self.sp_file = "{0}/{1}.sp".format(os.path.dirname(os.path.realpath(__file__)),name) design.hierarchy_layout.layout.__init__(self, name) design.hierarchy_spice.spice.__init__(self, name) @@ -46,10 +46,11 @@ class no_blockages_test(unittest.TestCase): offset=[0,0]) self.connect_inst([]) - r=router.router(gdsname+".gds") + self.gdsname = "{0}/{1}.gds".format(os.path.dirname(os.path.realpath(__file__)),gdsname) + r=router.router(self.gdsname) layer_stack =("metal1","via1","metal2") path=r.route(layer_stack,src="A",dest="B") - r.rg.view() + #r.rg.view() self.add_wire(layer_stack,path) diff --git a/compiler/router/tests/02_blockages_test.py b/compiler/router/tests/02_blockages_test.py index 485b39f6..4b4526e5 100644 --- a/compiler/router/tests/02_blockages_test.py +++ b/compiler/router/tests/02_blockages_test.py @@ -27,8 +27,8 @@ class no_blockages_test(unittest.TestCase): #design.design.__init__(self, name) debug.info(2, "Create {0} object".format(name)) self.name = name - self.gds_file = name + ".gds" - self.sp_file = name + ".sp" + self.gds_file = "{0}/{1}.gds".format(os.path.dirname(os.path.realpath(__file__)),name) + self.sp_file = "{0}/{1}.sp".format(os.path.dirname(os.path.realpath(__file__)),name) design.hierarchy_layout.layout.__init__(self, name) design.hierarchy_spice.spice.__init__(self, name) @@ -46,7 +46,8 @@ class no_blockages_test(unittest.TestCase): offset=[0,0]) self.connect_inst([]) - r=router.router(gdsname+".gds") + self.gdsname = "{0}/{1}.gds".format(os.path.dirname(os.path.realpath(__file__)),gdsname) + r=router.router(self.gdsname) layer_stack =("metal1","via1","metal2") path=r.route(layer_stack,src="A",dest="B") r.rg.view() diff --git a/compiler/router/tests/03_same_layer_pins_test.py b/compiler/router/tests/03_same_layer_pins_test.py index c8b10142..33826609 100644 --- a/compiler/router/tests/03_same_layer_pins_test.py +++ b/compiler/router/tests/03_same_layer_pins_test.py @@ -27,8 +27,8 @@ class no_blockages_test(unittest.TestCase): #design.design.__init__(self, name) debug.info(2, "Create {0} object".format(name)) self.name = name - self.gds_file = name + ".gds" - self.sp_file = name + ".sp" + self.gds_file = "{0}/{1}.gds".format(os.path.dirname(os.path.realpath(__file__)),name) + self.sp_file = "{0}/{1}.sp".format(os.path.dirname(os.path.realpath(__file__)),name) design.hierarchy_layout.layout.__init__(self, name) design.hierarchy_spice.spice.__init__(self, name) @@ -46,7 +46,8 @@ class no_blockages_test(unittest.TestCase): offset=[0,0]) self.connect_inst([]) - r=router.router(gdsname+".gds") + self.gdsname = "{0}/{1}.gds".format(os.path.dirname(os.path.realpath(__file__)),gdsname) + r=router.router(self.gdsname) layer_stack =("metal1","via1","metal2") path=r.route(layer_stack,src="A",dest="B") r.rg.view() diff --git a/compiler/router/tests/04_diff_layer_pins_test.py b/compiler/router/tests/04_diff_layer_pins_test.py index 0a7f5bbe..c7ac7dc4 100644 --- a/compiler/router/tests/04_diff_layer_pins_test.py +++ b/compiler/router/tests/04_diff_layer_pins_test.py @@ -27,8 +27,8 @@ class no_blockages_test(unittest.TestCase): #design.design.__init__(self, name) debug.info(2, "Create {0} object".format(name)) self.name = name - self.gds_file = name + ".gds" - self.sp_file = name + ".sp" + self.gds_file = "{0}/{1}.gds".format(os.path.dirname(os.path.realpath(__file__)),name) + self.sp_file = "{0}/{1}.sp".format(os.path.dirname(os.path.realpath(__file__)),name) design.hierarchy_layout.layout.__init__(self, name) design.hierarchy_spice.spice.__init__(self, name) @@ -46,7 +46,8 @@ class no_blockages_test(unittest.TestCase): offset=[0,0]) self.connect_inst([]) - r=router.router(gdsname+".gds") + self.gdsname = "{0}/{1}.gds".format(os.path.dirname(os.path.realpath(__file__)),gdsname) + r=router.router(self.gdsname) layer_stack =("metal1","via1","metal2") path=r.route(layer_stack,src="A",dest="B") diff --git a/compiler/router/tests/05_two_nets_test.py b/compiler/router/tests/05_two_nets_test.py index 0533a743..cd58564c 100644 --- a/compiler/router/tests/05_two_nets_test.py +++ b/compiler/router/tests/05_two_nets_test.py @@ -27,8 +27,8 @@ class no_blockages_test(unittest.TestCase): #design.design.__init__(self, name) debug.info(2, "Create {0} object".format(name)) self.name = name - self.gds_file = name + ".gds" - self.sp_file = name + ".sp" + self.gds_file = "{0}/{1}.gds".format(os.path.dirname(os.path.realpath(__file__)),name) + self.sp_file = "{0}/{1}.sp".format(os.path.dirname(os.path.realpath(__file__)),name) design.hierarchy_layout.layout.__init__(self, name) design.hierarchy_spice.spice.__init__(self, name) @@ -46,7 +46,8 @@ class no_blockages_test(unittest.TestCase): offset=[0,0]) self.connect_inst([]) - r=router.router(gdsname+".gds") + self.gdsname = "{0}/{1}.gds".format(os.path.dirname(os.path.realpath(__file__)),gdsname) + r=router.router(self.gdsname) layer_stack =("metal1","via1","metal2") path=r.route(layer_stack,src="A",dest="B") self.add_wire(layer_stack,path)