Update unit tests.

compiler/router/router.py

@@ -104,12 +104,21 @@ class router:
         for layer in self.layers:
             self.write_obstacle(self.top_name)
 
+    def clear_pins(self):
+        self.source = []
+        self.dest = []
 
-    def route(self,layers,src, dest):
+    def route(self, layers, src, dest):
+        """ 
+        Route a single source-destination net and return
+        the simplified rectilinear path.
+        """
+        self.clear_pins()
         self.set_layers(layers)
         self.create_routing_grid()
         self.set_source(src)
         self.set_target(dest)
+        
         self.find_blockages()
         # returns the path in tracks
         path = self.rg.route()

compiler/router/tests/01_no_blockages_test.py

@@ -49,7 +49,7 @@ class no_blockages_test(unittest.TestCase):
                 r=router.router(gdsname+".gds")
                 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)
 

compiler/router/tests/02_blockages_test.py

@@ -49,7 +49,7 @@ class no_blockages_test(unittest.TestCase):
                 r=router.router(gdsname+".gds")
                 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)
 

compiler/router/tests/03_same_layer_pins_test.py

@@ -49,7 +49,7 @@ class no_blockages_test(unittest.TestCase):
                 r=router.router(gdsname+".gds")
                 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)
 

compiler/router/tests/04_diff_layer_pins_test.py

@@ -49,7 +49,6 @@ class no_blockages_test(unittest.TestCase):
                 r=router.router(gdsname+".gds")
                 layer_stack =("metal1","via1","metal2")
                 path=r.route(layer_stack,src="A",dest="B")
-                r.rg.view()
                 
                 self.add_wire(layer_stack,path)
 

compiler/router/tests/05_two_nets_test.py

@@ -49,13 +49,17 @@ class no_blockages_test(unittest.TestCase):
                 r=router.router(gdsname+".gds")
                 layer_stack =("metal1","via1","metal2")
                 path=r.route(layer_stack,src="A",dest="B")
+                self.add_wire(layer_stack,path)
+
+                path=r.route(layer_stack,src="C",dest="D")
+                self.add_wire(layer_stack,path)
+                
                 r.rg.view()
                 
-                self.add_wire(layer_stack,path)
 
         
         
-        r = routing("test1", "AB_diff_layer_pins")
+        r = routing("test1", "ABCD_two_nets")
         self.local_check(r)
         
         # fails if there are any DRC errors on any cells

compiler/router/tests/ABCD_two_nets.sp

@@ -0,0 +1,3 @@
+
+.SUBCKT cell 
+.ENDS cell