From f4fcf95be5f8ed7ca7a59a319bd29163f96a9a9f Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 29 Nov 2022 15:33:34 +0100 Subject: [PATCH 1/8] correction in collectionscript and add printouts --- ci/collect_artifacts.py | 3 +++ ci/run_scheduled_sanitizer_test.py | 14 +++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ci/collect_artifacts.py b/ci/collect_artifacts.py index d3228ba2e8..d3e3d3a949 100755 --- a/ci/collect_artifacts.py +++ b/ci/collect_artifacts.py @@ -57,6 +57,9 @@ def collect_for_sanitizer_test(file): with open(file) as f: console_log = f.readlines() + print("CONSOLE_LOG:") + print(console_log) + files_to_archive_noPLC = find_failed_files_for_sanitizer_test( console_log, "logs_noPLC" ) diff --git a/ci/run_scheduled_sanitizer_test.py b/ci/run_scheduled_sanitizer_test.py index bc794bf2d8..2aaa49dee6 100755 --- a/ci/run_scheduled_sanitizer_test.py +++ b/ci/run_scheduled_sanitizer_test.py @@ -115,7 +115,7 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True) ) ) - with open(CONSOLE_OUT_FILE, "a") as f: + with open(CONSOLE_OUT_FILE, "w") as f: proc = subprocess.Popen( cmd_no_fec, stdout=subprocess.PIPE, stderr=subprocess.PIPE ) @@ -174,10 +174,14 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True) ) ) - proc = subprocess.Popen(cmd_fec, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - for c in iter(lambda: proc.stdout.read(1), b""): - sys.stdout.buffer.write(c) - proc.wait() + with open(CONSOLE_OUT_FILE, "a") as f: + proc = subprocess.Popen( + cmd_fec, stdout=subprocess.PIPE, stderr=subprocess.PIPE + ) + for c in iter(lambda: proc.stdout.read(1), b""): + sys.stdout.buffer.write(c) + f.write(c.decode("utf8")) + proc.wait() returncode_fec = proc.returncode print("returncode_fec:", returncode_fec) -- GitLab From 46376b5238253c69a3405a108b9d0db154befe7f Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 29 Nov 2022 15:40:02 +0100 Subject: [PATCH 2/8] add temporary hack in script -> revert later! --- ci/run_scheduled_sanitizer_test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/run_scheduled_sanitizer_test.py b/ci/run_scheduled_sanitizer_test.py index 2aaa49dee6..60402cbfd5 100755 --- a/ci/run_scheduled_sanitizer_test.py +++ b/ci/run_scheduled_sanitizer_test.py @@ -84,6 +84,9 @@ def get_modes(in_format: str) -> list: output = list_process.stdout.decode("utf8") mode_list = output.splitlines() + # temporary hack for faster debugging inside CI + mode_list = ["SBA_b80_dtx_swb_cbr", "SBA_b64_dtx_swb_cbr"] + # correction for multichannel modes to avoid selecting some mono modes... if in_format in MC_MODES: in_format = "MC_" + in_format + "_b" -- GitLab From 62947ad0320d99e5d28da2e8197330997de6175e Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 29 Nov 2022 15:40:50 +0100 Subject: [PATCH 3/8] change SBA san job to be able to run it alone from web -> revert later! --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef7291844c..88110a1020 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -882,7 +882,7 @@ sanitizer-test-mc-7_1_4: sanitizer-test-sba: extends: .sanitizer-test-schedule-C rules: - - if: $SANITIZER_SCHEDULE_C + - if: $SANITIZER_SBA script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py SBA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS -- GitLab From b4ccdc9824f3823195f362c876f08ba61ee02608 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 29 Nov 2022 15:54:29 +0100 Subject: [PATCH 4/8] intentionally add asan error for testing -> revert later --- lib_enc/ivas_front_vad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_enc/ivas_front_vad.c b/lib_enc/ivas_front_vad.c index 70b900da6d..378006724a 100644 --- a/lib_enc/ivas_front_vad.c +++ b/lib_enc/ivas_front_vad.c @@ -414,7 +414,7 @@ ivas_error front_vad_spar( *-----------------------------------------------------------------*/ st->input = input; - mvr2r( omni_in, st->input, input_frame ); + mvr2r( omni_in, st->input, input_frame * 4 ); delay_signal( st->input, input_frame, hFrontVad->delay_buf, hFrontVad->delay_samples ); -- GitLab From e33fd9fa62c8c649aa5c5a6b8ddee405f294145e Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 29 Nov 2022 15:59:56 +0100 Subject: [PATCH 5/8] Revert "intentionally add asan error for testing -> revert later" This reverts commit b4ccdc9824f3823195f362c876f08ba61ee02608. --- lib_enc/ivas_front_vad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_enc/ivas_front_vad.c b/lib_enc/ivas_front_vad.c index 378006724a..70b900da6d 100644 --- a/lib_enc/ivas_front_vad.c +++ b/lib_enc/ivas_front_vad.c @@ -414,7 +414,7 @@ ivas_error front_vad_spar( *-----------------------------------------------------------------*/ st->input = input; - mvr2r( omni_in, st->input, input_frame * 4 ); + mvr2r( omni_in, st->input, input_frame ); delay_signal( st->input, input_frame, hFrontVad->delay_buf, hFrontVad->delay_samples ); -- GitLab From 2fa9779bb46949b587e200c0e4f51b49b8732b11 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 29 Nov 2022 16:00:19 +0100 Subject: [PATCH 6/8] Revert "change SBA san job to be able to run it alone from web" This reverts commit 62947ad0320d99e5d28da2e8197330997de6175e. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88110a1020..ef7291844c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -882,7 +882,7 @@ sanitizer-test-mc-7_1_4: sanitizer-test-sba: extends: .sanitizer-test-schedule-C rules: - - if: $SANITIZER_SBA + - if: $SANITIZER_SCHEDULE_C script: - *update-ltv-repo - python3 ci/run_scheduled_sanitizer_test.py SBA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS -- GitLab From de5ab3a522e5767d2183e24b02b16a043b928677 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 29 Nov 2022 16:00:24 +0100 Subject: [PATCH 7/8] Revert "add temporary hack in script -> revert later!" This reverts commit 46376b5238253c69a3405a108b9d0db154befe7f. --- ci/run_scheduled_sanitizer_test.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci/run_scheduled_sanitizer_test.py b/ci/run_scheduled_sanitizer_test.py index 60402cbfd5..2aaa49dee6 100755 --- a/ci/run_scheduled_sanitizer_test.py +++ b/ci/run_scheduled_sanitizer_test.py @@ -84,9 +84,6 @@ def get_modes(in_format: str) -> list: output = list_process.stdout.decode("utf8") mode_list = output.splitlines() - # temporary hack for faster debugging inside CI - mode_list = ["SBA_b80_dtx_swb_cbr", "SBA_b64_dtx_swb_cbr"] - # correction for multichannel modes to avoid selecting some mono modes... if in_format in MC_MODES: in_format = "MC_" + in_format + "_b" -- GitLab From 2983ae29e66d3d0ea3243e9c855313a309b36a22 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 29 Nov 2022 16:03:17 +0100 Subject: [PATCH 8/8] remove confusing printout --- ci/collect_artifacts.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci/collect_artifacts.py b/ci/collect_artifacts.py index edb1ff70c3..6cd0a77ed7 100755 --- a/ci/collect_artifacts.py +++ b/ci/collect_artifacts.py @@ -57,9 +57,6 @@ def collect_for_sanitizer_test(file): with open(file) as f: console_log = f.readlines() - print("CONSOLE_LOG:") - print(console_log) - files_to_archive_noPLC = find_failed_files_for_sanitizer_test( console_log, "logs_noPLC" ) -- GitLab