diff --git a/minitests/roi_harness/create_design_json.py b/minitests/roi_harness/create_design_json.py index 86b9b919..549ad7ac 100644 --- a/minitests/roi_harness/create_design_json.py +++ b/minitests/roi_harness/create_design_json.py @@ -1,4 +1,4 @@ -import json +import xjson import csv import argparse import sys @@ -112,7 +112,7 @@ def main(): design_json['required_features'] = fasm.fasm_tuple_to_string( required_features, canonical=True) - json.dump(design_json, sys.stdout, indent=2, sort_keys=True) + xjson.pprint(sys.stdout, design_json) if __name__ == '__main__': diff --git a/minitests/roi_harness/runme.sh b/minitests/roi_harness/runme.sh index 2e2e96ff..73a31fa8 100755 --- a/minitests/roi_harness/runme.sh +++ b/minitests/roi_harness/runme.sh @@ -62,7 +62,7 @@ test -z "$(fgrep CRITICAL vivado.log)" ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o design.bits -z -y design.bit python3 ${XRAY_DIR}/utils/bit2fasm.py --verbose design.bit > design.fasm python3 ${XRAY_DIR}/utils/fasm2frames.py design.fasm design.frm -python3 ../create_design_json.py \ +PYTHONPATH=$PYTHONPATH:$XRAY_DIR/utils python3 ../create_design_json.py \ --design_info_txt design_info.txt \ --design_txt design.txt \ --pad_wires design_pad_wires.txt \