From c509615ec919a8171d4198a3e8f7f735bf3ec8d3 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Thu, 16 May 2024 02:44:28 -0700 Subject: [PATCH] tests: Pretty print Dict when compating for PyStats Change-Id: I1d93453072d12aa2dd40066f364723de1225b4e0 --- tests/gem5/stats/configs/pystat_scalar_check.py | 5 +++-- tests/gem5/stats/configs/pystat_sparse_dist_check.py | 5 +++-- tests/gem5/stats/configs/pystat_vector2d_check.py | 5 +++-- tests/gem5/stats/configs/pystat_vector_check.py | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/gem5/stats/configs/pystat_scalar_check.py b/tests/gem5/stats/configs/pystat_scalar_check.py index 3c98f901df..1fe61b7f62 100644 --- a/tests/gem5/stats/configs/pystat_scalar_check.py +++ b/tests/gem5/stats/configs/pystat_scalar_check.py @@ -25,6 +25,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import argparse +import json import sys import m5 @@ -99,8 +100,8 @@ if output != expected_output: print("Output statistics do not match expected:", file=sys.stderr) print("", file=sys.stderr) print("Expected:", file=sys.stderr) - print(expected_output, file=sys.stderr) + print(json.dumps(expected_output, indent=4), file=sys.stderr) print("", file=sys.stderr) print("Actual:", file=sys.stderr) - print(output, file=sys.stderr) + print(json.dumps(output, indent=4), file=sys.stderr) sys.exit(1) diff --git a/tests/gem5/stats/configs/pystat_sparse_dist_check.py b/tests/gem5/stats/configs/pystat_sparse_dist_check.py index 57afbd7ffa..2d7bc4b6c1 100644 --- a/tests/gem5/stats/configs/pystat_sparse_dist_check.py +++ b/tests/gem5/stats/configs/pystat_sparse_dist_check.py @@ -25,6 +25,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import argparse +import json import sys import m5 @@ -113,8 +114,8 @@ if output != expected_output: print("Output statistics do not match expected:", file=sys.stderr) print("", file=sys.stderr) print("Expected:", file=sys.stderr) - print(expected_output, file=sys.stderr) + print(json.dumps(expected_output, indent=4), file=sys.stderr) print("", file=sys.stderr) print("Actual:", file=sys.stderr) - print(output, file=sys.stderr) + print(json.dumps(output, indent=4), file=sys.stderr) sys.exit(1) diff --git a/tests/gem5/stats/configs/pystat_vector2d_check.py b/tests/gem5/stats/configs/pystat_vector2d_check.py index 539a3cb6be..617463e56f 100644 --- a/tests/gem5/stats/configs/pystat_vector2d_check.py +++ b/tests/gem5/stats/configs/pystat_vector2d_check.py @@ -25,6 +25,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import argparse +import json import sys import m5 @@ -174,8 +175,8 @@ if output != expected_output: print("Output statistics do not match expected:", file=sys.stderr) print("", file=sys.stderr) print("Expected:", file=sys.stderr) - print(expected_output, file=sys.stderr) + print(json.dumps(expected_output, indent=4), file=sys.stderr) print("", file=sys.stderr) print("Actual:", file=sys.stderr) - print(output, file=sys.stderr) + print(json.dumps(output, indent=4), file=sys.stderr) sys.exit(1) diff --git a/tests/gem5/stats/configs/pystat_vector_check.py b/tests/gem5/stats/configs/pystat_vector_check.py index 1f8b18a577..e708f0319f 100644 --- a/tests/gem5/stats/configs/pystat_vector_check.py +++ b/tests/gem5/stats/configs/pystat_vector_check.py @@ -25,6 +25,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import argparse +import json import sys import m5 @@ -139,8 +140,8 @@ if output != expected_output: print("Output statistics do not match expected:", file=sys.stderr) print("", file=sys.stderr) print("Expected:", file=sys.stderr) - print(expected_output, file=sys.stderr) + print(json.dumps(expected_output, indent=4), file=sys.stderr) print("", file=sys.stderr) print("Actual:", file=sys.stderr) - print(output, file=sys.stderr) + print(json.dumps(output, indent=4), file=sys.stderr) sys.exit(1)