From cac193226abc9f0921e42666cfb74e931ddd7d13 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 23 Jan 2024 10:17:02 +0100 Subject: [PATCH] adjust issue template and fix supp file abs path in script --- .gitlab/issue_templates/sanitizer_error.md | 4 ++-- scripts/IvasBuildAndRunChecks.py | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitlab/issue_templates/sanitizer_error.md b/.gitlab/issue_templates/sanitizer_error.md index 10ba7c7991..e5b42ba2f4 100644 --- a/.gitlab/issue_templates/sanitizer_error.md +++ b/.gitlab/issue_templates/sanitizer_error.md @@ -4,7 +4,7 @@ ### Bug description -Clang (msan/asan?) sanitizer test in pipeline found an error: +Clang (m,a,u)san sanitizer test in pipeline found an error: ``` @@ -20,7 +20,7 @@ Using the [scripts](https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec/-/wikis/ ``` -python3 scripts/IvasBuildAndRunChecks.py --checks CLANGX -m MODE -p /path/to/my/local/ci_linux_ltv_local.json +python3 scripts/IvasBuildAndRunChecks.py --checks CLANGX -m MODE -p /path/to/my/local/ci_linux_ltv_local.json --usan_supp_file scripts/ubsan.supp ``` or directly: diff --git a/scripts/IvasBuildAndRunChecks.py b/scripts/IvasBuildAndRunChecks.py index 78e836eaa7..680f7e16d0 100755 --- a/scripts/IvasBuildAndRunChecks.py +++ b/scripts/IvasBuildAndRunChecks.py @@ -120,6 +120,11 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript): else: checks = self.args["checks"] + usan_supp_file = None + # need to convert to abs path as runtime dir will be different from calling dir + if self.args["usan_supp_file"] is not None: + usan_supp_file = os.path.abspath(self.args["usan_supp_file"]) + if self.args["svn"]: br = IvasBuilderAndRunner.fromSvn( self.args["svn"], @@ -161,7 +166,7 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript): format_select_list=modes, formats_fname=self.args["format_file"], max_workers=self.args["max_workers"], - usan_supp_file=self.args["usan_supp_file"], + usan_supp_file=usan_supp_file, ) IvasScriptsCommon.runner_setup( br.build_and_run_dict[check]["runner"], self.args -- GitLab