From 93d448e135284ec429935387f0b82b5da1f0ac21 Mon Sep 17 00:00:00 2001
From: Alessandro Comodi <acomodi@antmicro.com>
Date: Wed, 15 Jan 2020 17:34:33 +0100
Subject: [PATCH] fixing tests

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
---
 tests/test_util.py                                    |  1 +
 utils/fasm2frames.py                                  |  7 +++----
 utils/quick_test.py                                   | 11 +++++++----
 utils/segprint.py                                     |  5 ++++-
 .../db/{xc7_package_pins.csv => xc7/package_pins.csv} |  0
 utils/test_data/db/{xc7.json => xc7/part.json}        |  0
 utils/test_data/db/{ => xc7}/tilegrid.json            |  0
 utils/verify_tile_connections.py                      |  5 +++--
 8 files changed, 18 insertions(+), 11 deletions(-)
 rename utils/test_data/db/{xc7_package_pins.csv => xc7/package_pins.csv} (100%)
 rename utils/test_data/db/{xc7.json => xc7/part.json} (100%)
 rename utils/test_data/db/{ => xc7}/tilegrid.json (100%)

diff --git a/tests/test_util.py b/tests/test_util.py
index 929ea9e0..98f83fb3 100755
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -10,6 +10,7 @@ from unittest import TestCase, main
 # in the current subdirectory, which will be a temporary one, to allow concurent
 # testing.
 environ['XRAY_DATABASE_ROOT'] = '.'
+environ['XRAY_PART'] = './'
 
 from prjxray.util import get_roi
 
diff --git a/utils/fasm2frames.py b/utils/fasm2frames.py
index 4b9821ac..8260a95e 100755
--- a/utils/fasm2frames.py
+++ b/utils/fasm2frames.py
@@ -109,7 +109,7 @@ def run(
         roi=None,
         debug=False,
         emit_pudc_b_pullup=False):
-    db = Database(db_root)
+    db = Database(db_root, part)
     assembler = fasm_assembler.FasmAssembler(db)
 
     set_features = set()
@@ -124,12 +124,11 @@ def run(
     bank_to_tile = defaultdict(lambda: set())
 
     if part is not None:
-        with open(os.path.join(db_root, part + "_package_pins.csv"),
-                  "r") as fp:
+        with open(os.path.join(db_root, part, "package_pins.csv"), "r") as fp:
             reader = csv.DictReader(fp)
             package_pins = [l for l in reader]
 
-        with open(os.path.join(db_root, part + ".json"), "r") as fp:
+        with open(os.path.join(db_root, part, "part.json"), "r") as fp:
             part_data = json.load(fp)
 
         for bank, loc in part_data["iobanks"].items():
diff --git a/utils/quick_test.py b/utils/quick_test.py
index 6575d129..c8ced2b2 100755
--- a/utils/quick_test.py
+++ b/utils/quick_test.py
@@ -1,10 +1,11 @@
 from __future__ import print_function
 import prjxray.db
+import prjxray.util
 import argparse
 
 
-def quick_test(db_root):
-    db = prjxray.db.Database(db_root)
+def quick_test(db_root, part):
+    db = prjxray.db.Database(db_root, part)
     g = db.grid()
 
     # Verify that we have some tile information for every tile in grid.
@@ -47,11 +48,13 @@ def quick_test(db_root):
 def main():
     parser = argparse.ArgumentParser(
         description="Runs a sanity check on a prjxray database.")
-    parser.add_argument('--db-root', required=True)
+
+    util.db_root_arg(parser)
+    util.part_arg(parser)
 
     args = parser.parse_args()
 
-    quick_test(args.db_root)
+    quick_test(args.db_root, args.part)
 
 
 if __name__ == '__main__':
diff --git a/utils/segprint.py b/utils/segprint.py
index 2a40de34..fcdd2ec7 100755
--- a/utils/segprint.py
+++ b/utils/segprint.py
@@ -428,6 +428,7 @@ def load_tiles(db_root):
 
 def run(
         db_root,
+        part,
         bits_file,
         segnames,
         omit_empty_segs=False,
@@ -436,7 +437,7 @@ def run(
         flag_decode_omit=False,
         bit_only=False,
         verbose=False):
-    db = prjxraydb.Database(db_root)
+    db = prjxraydb.Database(db_root, part)
     tiles = load_tiles(db_root)
     segments = mk_segments(tiles)
     bitdata = bitstream.load_bitdata2(open(bits_file, "r"))
@@ -477,6 +478,7 @@ def main():
         description="Decode bits within a tile's address space")
 
     util.db_root_arg(parser)
+    util.part_arg(parser)
     parser.add_argument('--verbose', action='store_true', help='')
     parser.add_argument(
         '-z',
@@ -503,6 +505,7 @@ def main():
 
     run(
         args.db_root,
+        args.part,
         args.bits_file,
         args.segnames,
         args.z,
diff --git a/utils/test_data/db/xc7_package_pins.csv b/utils/test_data/db/xc7/package_pins.csv
similarity index 100%
rename from utils/test_data/db/xc7_package_pins.csv
rename to utils/test_data/db/xc7/package_pins.csv
diff --git a/utils/test_data/db/xc7.json b/utils/test_data/db/xc7/part.json
similarity index 100%
rename from utils/test_data/db/xc7.json
rename to utils/test_data/db/xc7/part.json
diff --git a/utils/test_data/db/tilegrid.json b/utils/test_data/db/xc7/tilegrid.json
similarity index 100%
rename from utils/test_data/db/tilegrid.json
rename to utils/test_data/db/xc7/tilegrid.json
diff --git a/utils/verify_tile_connections.py b/utils/verify_tile_connections.py
index d8da4555..1eb743a0 100755
--- a/utils/verify_tile_connections.py
+++ b/utils/verify_tile_connections.py
@@ -37,8 +37,8 @@ def make_connection(wires, connection):
         wires[wire] = wire_a_set
 
 
-def make_connections(db_root):
-    db = prjxray.db.Database(db_root)
+def make_connections(db_root, part):
+    db = prjxray.db.Database(db_root, part)
     c = db.connections()
 
     wires = {}
@@ -61,6 +61,7 @@ def read_json5(fname):
 def main():
     parser = argparse.ArgumentParser(
         description="Tests database against raw node list.")
+
     util.db_root_arg(parser)
     util.part_arg(parser)
     parser.add_argument('--raw_node_root', required=True)