Merge branch '1171-scripts-self_test-py-usage-of-wrong-reference-executables' into 'main' (a3ab1bf0) · Commits · IVAS Codec Public Collaboration / IVAS Codec

scripts/self_test.py

+20 −4

Original line number	Diff line number	Diff line
		@@ -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"
		)

		if self.args["encref"] 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 not 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: