Tests pass now

6 files changed, 12 insertions, 6 deletions

diff --git a/tests/ice40/hx1k.cc b/tests/ice40/hx1k.cc
index 1d212f6a..7dd7bbe1 100644
--- a/tests/ice40/hx1k.cc
+++ b/tests/ice40/hx1k.cc
@@ -9,6 +9,7 @@ class HX1KTest : public ::testing::Test
   protected:
     virtual void SetUp()
     {
+        IdString::global_ctx = nullptr;
         chipArgs.type = ArchArgs::HX1K;
         chipArgs.package = "tq144";
         ctx = new Context(chipArgs);
@@ -28,7 +29,7 @@ TEST_F(HX1KTest, bel_names)
         ASSERT_EQ(bel, ctx->getBelByName(name));
         bel_count++;
     }
-    ASSERT_EQ(bel_count, 1416);
+    ASSERT_EQ(bel_count, 1418);
 }
 
 TEST_F(HX1KTest, wire_names)
diff --git a/tests/ice40/hx8k.cc b/tests/ice40/hx8k.cc
index eef5eb7c..a8d0834e 100644
--- a/tests/ice40/hx8k.cc
+++ b/tests/ice40/hx8k.cc
@@ -9,6 +9,7 @@ class HX8KTest : public ::testing::Test
   protected:
     virtual void SetUp()
     {
+        IdString::global_ctx = nullptr;
         chipArgs.type = ArchArgs::HX8K;
         chipArgs.package = "ct256";
         ctx = new Context(chipArgs);
@@ -28,7 +29,7 @@ TEST_F(HX8KTest, bel_names)
         ASSERT_EQ(bel, ctx->getBelByName(name));
         bel_count++;
     }
-    ASSERT_EQ(bel_count, 7968);
+    ASSERT_EQ(bel_count, 7979);
 }
 
 TEST_F(HX8KTest, wire_names)
diff --git a/tests/ice40/lp1k.cc b/tests/ice40/lp1k.cc
index 392cf5c6..c80d43f9 100644
--- a/tests/ice40/lp1k.cc
+++ b/tests/ice40/lp1k.cc
@@ -9,6 +9,7 @@ class LP1KTest : public ::testing::Test
   protected:
     virtual void SetUp()
     {
+        IdString::global_ctx = nullptr;
         chipArgs.type = ArchArgs::LP1K;
         chipArgs.package = "tq144";
         ctx = new Context(chipArgs);
@@ -28,7 +29,7 @@ TEST_F(LP1KTest, bel_names)
         ASSERT_EQ(bel, ctx->getBelByName(name));
         bel_count++;
     }
-    ASSERT_EQ(bel_count, 1416);
+    ASSERT_EQ(bel_count, 1418);
 }
 
 TEST_F(LP1KTest, wire_names)
diff --git a/tests/ice40/lp384.cc b/tests/ice40/lp384.cc
index f54683f6..aedc3b6d 100644
--- a/tests/ice40/lp384.cc
+++ b/tests/ice40/lp384.cc
@@ -9,6 +9,7 @@ class LP384Test : public ::testing::Test
   protected:
     virtual void SetUp()
     {
+        IdString::global_ctx = nullptr;
         chipArgs.type = ArchArgs::LP384;
         chipArgs.package = "qn32";
         ctx = new Context(chipArgs);
@@ -28,7 +29,7 @@ TEST_F(LP384Test, bel_names)
         ASSERT_EQ(bel, ctx->getBelByName(name));
         bel_count++;
     }
-    ASSERT_EQ(bel_count, 440);
+    ASSERT_EQ(bel_count, 449);
 }
 
 TEST_F(LP384Test, wire_names)
diff --git a/tests/ice40/lp8k.cc b/tests/ice40/lp8k.cc
index 940e1c20..e8e9cb0b 100644
--- a/tests/ice40/lp8k.cc
+++ b/tests/ice40/lp8k.cc
@@ -9,6 +9,7 @@ class LP8KTest : public ::testing::Test
   protected:
     virtual void SetUp()
     {
+        IdString::global_ctx = nullptr;
         chipArgs.type = ArchArgs::LP8K;
         chipArgs.package = "ct256";
         ctx = new Context(chipArgs);
@@ -28,7 +29,7 @@ TEST_F(LP8KTest, bel_names)
         ASSERT_EQ(bel, ctx->getBelByName(name));
         bel_count++;
     }
-    ASSERT_EQ(bel_count, 7968);
+    ASSERT_EQ(bel_count, 7979);
 }
 
 TEST_F(LP8KTest, wire_names)
diff --git a/tests/ice40/up5k.cc b/tests/ice40/up5k.cc
index f6a58b3a..c7de5269 100644
--- a/tests/ice40/up5k.cc
+++ b/tests/ice40/up5k.cc
@@ -9,6 +9,7 @@ class UP5KTest : public ::testing::Test
   protected:
     virtual void SetUp()
     {
+        IdString::global_ctx = nullptr;
         chipArgs.type = ArchArgs::UP5K;
         chipArgs.package = "sg48";
         ctx = new Context(chipArgs);
@@ -28,7 +29,7 @@ TEST_F(UP5KTest, bel_names)
         ASSERT_EQ(bel, ctx->getBelByName(name));
         bel_count++;
     }
-    ASSERT_EQ(bel_count, 5414);
+    ASSERT_EQ(bel_count, 5438);
 }
 
 TEST_F(UP5KTest, wire_names)