From d94e6a00edc22a1dd4946b3603aebb29319ce5ce Mon Sep 17 00:00:00 2001 From: imarom Date: Sun, 25 Sep 2016 14:58:51 +0300 Subject: split multicore - all tests pass --- .../stl/trex_stl_lib/trex_stl_sim.py | 26 ++++++---------------- .../stl/trex_stl_lib/utils/parsing_opts.py | 1 - 2 files changed, 7 insertions(+), 20 deletions(-) (limited to 'scripts/automation/trex_control_plane/stl/trex_stl_lib') diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py index 63a1232b..54ec2da9 100644 --- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py +++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py @@ -558,25 +558,13 @@ def test_multi_core (r, options): print("") - print(format_text("comparing 2 cores to 1 core:\n", 'underline')) - rc = compare_caps_strict('1.cap', '2.cap') - if rc: - print("[Passed]\n") - - print(format_text("comparing 4 cores to 1 core:\n", 'underline')) - rc = compare_caps('1.cap', '4.cap') - if rc: - print("[Passed]\n") - - print(format_text("comparing 6 cores to 1 core:\n", 'underline')) - rc = compare_caps('1.cap', '6.cap') - if rc: - print("[Passed]\n") - - print(format_text("comparing 8 cores to 1 core:\n", 'underline')) - rc = compare_caps('1.cap', '8.cap') - if rc: - print("[Passed]\n") + for core_count in range(1, 9): + print(format_text("comparing {0} cores to 1 core:\n".format(core_count), 'underline')) + rc = compare_caps_strict('1.cap', '{0}.cap'.format(core_count)) + if rc: + print("[Passed]\n") + + return def main (args = None): diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py index 65333e0f..b42b56af 100755 --- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py +++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py @@ -222,7 +222,6 @@ def decode_tunables (tunable_str): # each token is of form X=Y for token in tokens: - print(token) m = re.search('(.*)=(.*)', token) if not m: raise argparse.ArgumentTypeError("bad syntax for tunables: {0}".format(token)) -- cgit 1.2.3-korg