From b1b2dc1f5e8cd68c85ffa0c4c81521aba273164d Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 9 Jan 2025 10:22:05 +0100 Subject: [PATCH 1/3] log command lines of eid-xor and netsim tools --- tests/conftest.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/conftest.py b/tests/conftest.py index bb9e8ca387..3b3325795f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -749,6 +749,7 @@ class DecoderFrontend: cwd = Path(tmp_dir).absolute() else: cwd = Path(run_dir).absolute() + log_dbg_msg(f"eid-xor command:\n {" ".join(eid_command)}") result = run(eid_command, check=True, cwd=cwd) except Exception as e: pytest.fail(f"eid-xor operation failed! - {e}") @@ -793,6 +794,7 @@ class DecoderFrontend: else: cwd = Path(run_dir).absolute() run(netsim_command, check=True, cwd=cwd) + log_dbg_msg(f"netsim command:\n {" ".join(netsim_command)}") except Exception as e: pytest.fail(f"netsim operation failed! - {e}") -- GitLab From 19a9602a0883e38275574753c6d927fc8aaf0f46 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 9 Jan 2025 10:47:03 +0100 Subject: [PATCH 2/3] fix f srings --- tests/conftest.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 3b3325795f..a82ee1a13a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -749,7 +749,9 @@ class DecoderFrontend: cwd = Path(tmp_dir).absolute() else: cwd = Path(run_dir).absolute() - log_dbg_msg(f"eid-xor command:\n {" ".join(eid_command)}") + + eid_command_str = " ".join(eid_command) + log_dbg_msg(f"eid-xor command:\n {eid_command_str}") result = run(eid_command, check=True, cwd=cwd) except Exception as e: pytest.fail(f"eid-xor operation failed! - {e}") @@ -794,7 +796,9 @@ class DecoderFrontend: else: cwd = Path(run_dir).absolute() run(netsim_command, check=True, cwd=cwd) - log_dbg_msg(f"netsim command:\n {" ".join(netsim_command)}") + + netsim_command_str = " ".join(netsim_command) + log_dbg_msg(f"netsim command:\n {netsim_command_str}") except Exception as e: pytest.fail(f"netsim operation failed! - {e}") -- GitLab From fce8ba2896e31e11bda56bd1c1ac7b5eae0540af Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 9 Jan 2025 11:08:55 +0100 Subject: [PATCH 3/3] change path objects to stringsin netsim command --- tests/conftest.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index a82ee1a13a..e7f591f4d4 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -781,11 +781,11 @@ class DecoderFrontend: tracefile_path = input_bitstream_path.with_suffix(".netsimtrace") # TODO: need to check if the "1" works with every profile netsim_command = [ - netsim_path, - netsim_profile, - input_bitstream_path, - netsim_bitstream_path, - tracefile_path, + str(netsim_path), + str(netsim_profile), + str(input_bitstream_path), + str(netsim_bitstream_path), + str(tracefile_path), "1", ] print(netsim_command) -- GitLab