From 76f324f004ca746f663c9e940098e6d032e09cf7 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Tue, 24 Sep 2024 15:52:45 +0200 Subject: [PATCH 1/2] fix ignored --encref and --decref option when used with --create --- scripts/self_test.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/scripts/self_test.py b/scripts/self_test.py index 714366bcf1..968cba8bf3 100755 --- a/scripts/self_test.py +++ b/scripts/self_test.py @@ -48,9 +48,9 @@ import pyivastest.constants as constants import pyivastest.ivas_svn as svn from pyivastest import IvasScriptsCommon from pyivastest.IvasModeAnalyzer import * -from pyivastest.IvasModeCollector import * from pyivastest.IvasModeRunner import * from pyivastest.IvasSvnBuilder import * +from pyivastest.IvasModeCollector import IvasModeCollector BW_TO_SR = {"nb": 8, "wb": 16, "swb": 32, "fb": 48} SR_TO_BW = {"8": "nb", "16": "wb", "32": "swb", "48": "fb"} @@ -1276,11 +1276,27 @@ class SelfTest(IvasScriptsCommon.IvasScript): self.logger.console( "Create mode: ignoring all other optional commandline arguments regarding reference and test conditions" ) - self.args["encref"] = default_enc_test - self.args["decref"] = default_dec_test - self.args["srcdirref"] = constants.WC_BASE_DIR + + if self.args["encref"] is None: + if self.args["enctest"] is None: + # use Test encoder binary for reference generation + self.args["encref"] = os.path.realpath(self.args["enctest"]) + else: + self.args["encref"] = default_enc_test + + if self.args["decref"] is None: + if self.args["dectest"] is None: + # use Test decoder binary for reference generation + self.args["decref"] = os.path.realpath(self.args["dectest"]) + else: + self.args["decref"] = default_dec_test + + if self.args["srcdirref"] is None: + self.args["srcdirref"] = constants.WC_BASE_DIR + if self.valgrind is not None and self.args["valgrind"] is True: valgrind_ref = self.valgrind + create_mode = True run_ref = True else: -- GitLab From b155ca105f94b868f90c14f0f0c2ad65a32dbfae Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Fri, 27 Sep 2024 13:34:24 +0200 Subject: [PATCH 2/2] correction of if statement --- scripts/self_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/self_test.py b/scripts/self_test.py index 968cba8bf3..7688fc50f9 100755 --- a/scripts/self_test.py +++ b/scripts/self_test.py @@ -1278,14 +1278,14 @@ class SelfTest(IvasScriptsCommon.IvasScript): ) if self.args["encref"] is None: - if self.args["enctest"] is None: + if self.args["enctest"] is not None: # use Test encoder binary for reference generation self.args["encref"] = os.path.realpath(self.args["enctest"]) else: self.args["encref"] = default_enc_test if self.args["decref"] is None: - if self.args["dectest"] is None: + if self.args["dectest"] is not None: # use Test decoder binary for reference generation self.args["decref"] = os.path.realpath(self.args["dectest"]) else: -- GitLab