From c51e4b9b3c7f5f5483ea770d5661369b31669854 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 29 Nov 2022 13:50:16 +0100 Subject: [PATCH 1/3] add debug output to complexity jobs --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f643add34..f0cb125fd9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -965,6 +965,7 @@ coverage-test-on-main-scheduled: - sed -i "s/IVAS FORMAT/IVAS $in_format to $out_format/g" ${public_dir}/index.html # do separately here to avoid overwrite complaints by mv - mv -f ci/complexity_measurements/style.css ${public_dir}/ + - ls $public_dir .complexity-template: extends: -- GitLab From 0b442584e045a4d4d217244314dc40266302effa Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 29 Nov 2022 14:19:59 +0100 Subject: [PATCH 2/3] raise Error when error file is given, but needed binary is missing --- scripts/pyivastest/IvasScriptsCommon.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/scripts/pyivastest/IvasScriptsCommon.py b/scripts/pyivastest/IvasScriptsCommon.py index 45631566e9..46e6a2f4a8 100644 --- a/scripts/pyivastest/IvasScriptsCommon.py +++ b/scripts/pyivastest/IvasScriptsCommon.py @@ -544,12 +544,18 @@ def runner_setup(runner, args): runner.limit_duration = True runner.max_duration = args["limit_duration"] + if "fer_file" in args.keys() or "ber_file" in args.keys(): + # assert that the eid-xor tool is there + eid_xor_path = os.path.join(runner.config["utilPath"], "eid-xor") + if not os.path.isfile(eid_xor_path): + raise FileNotFoundError(f"Could not find {eid_xor_path} (needed for error pattern insertion)") + if args["fer_file"]: fer_suffix = "fer_{}".format( "_".join(os.path.basename(args["fer_file"]).split(".")) ) fer_cmd = [ - os.path.join(runner.config["utilPath"], "eid-xor"), + eid_xor_path, "-vbr", "-fer", "{in_file}", @@ -564,7 +570,7 @@ def runner_setup(runner, args): "_".join(os.path.basename(args["ber_file"]).split(".")) ) ber_cmd = [ - os.path.join(runner.config["utilPath"], "eid-xor"), + eid_xor_path, "-vbr", "-ber", "{in_file}", @@ -634,12 +640,19 @@ def runner_setup(runner, args): def analyzer_setup(analyzer, args): bs_proc_chain = {} + + if "fer_file" in args.keys() or "ber_file" in args.keys(): + # assert that the eid-xor tool is there + eid_xor_path = os.path.join(analyzer.config["utilPath"], "eid-xor") + if not os.path.isfile(eid_xor_path): + raise FileNotFoundError(f"Could not find {eid_xor_path} (needed for error pattern insertion)") + if args["fer_file"]: fer_suffix = "fer_{}".format( "_".join(os.path.basename(args["fer_file"]).split(".")) ) fer_cmd = [ - os.path.join(analyzer.config["utilPath"], "eid-xor"), + eid_xor_path, "-vbr", "-fer", "{in_file}", @@ -654,7 +667,7 @@ def analyzer_setup(analyzer, args): "_".join(os.path.basename(args["ber_file"]).split(".")) ) ber_cmd = [ - os.path.join(analyzer.config["utilPath"], "eid-xor"), + eid_xor_path, "-vbr", "-ber", "{in_file}", -- GitLab From 76b85009e50829dd7fca7be3b9db3afaced43199 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 29 Nov 2022 14:48:07 +0100 Subject: [PATCH 3/3] add printout to sanitizer artifact collection --- ci/collect_artifacts.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/collect_artifacts.py b/ci/collect_artifacts.py index d3228ba2e8..6cd0a77ed7 100755 --- a/ci/collect_artifacts.py +++ b/ci/collect_artifacts.py @@ -62,6 +62,9 @@ def collect_for_sanitizer_test(file): ) files_to_archive = find_failed_files_for_sanitizer_test(console_log, "logs") + print("files_to_archive_noPLC:", files_to_archive_noPLC) + print("files_to_archive:", files_to_archive) + log_folder = pathlib.Path("./LOGS_PLC") log_folder.mkdir() for test in files_to_archive.keys(): -- GitLab