Commit e39cd8a9 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into 744_step3_code_changes

parents 8a5f643a bf3f5796

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ variables: 
  BUILD_OUTPUT: "build_output.txt"

  EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test"

  EVS_BE_WIN_TEST_DIR: "C:/Users/gitlab-runner/testvec"

  SANITIZER_TESTS: "CLANG1 CLANG2"

  SANITIZER_TESTS: "CLANG1 CLANG2 CLANG3"

  OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4"

  OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3"

  OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"

ci/run_scheduled_sanitizer_test.py

+4 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ from combine_genpatt_and_jbm_profile import combine_error_profiles 
SCRIPT_DIR = pathlib.Path("./scripts").resolve()

DURATION = "120"

CFG = "ci_linux_ltv.json"

SUPPORTED_TESTS = ["CLANG1", "CLANG2", "CLANG3", "VALGRIND"]

SUPPORTED_TESTS = ["CLANG1", "CLANG2", "CLANG3"]

USAN_SUPP_FILE = str(SCRIPT_DIR.joinpath("ubsan.supp"))

EP_FILE = "ep_015.g192"

DLY_PROFILE_IN = SCRIPT_DIR.joinpath("dly_error_profiles/dly_error_profile_5.dat")

DLY_PROFILE_OUT = "dly_profile.dat"
@@ -145,6 +146,8 @@ def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = Tr 
        "--oc",

        *out_formats,

        *md_file_command,

        "--usan_supp_file",

        USAN_SUPP_FILE,

    ]



    print(

scripts/IvasBuildAndRunChecks.py

+10 −3
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript): 
        self.parser.add_argument(

            "--rebuild", help="force a rebuild of the binaries", action="store_true"

        )

        self.parser.add_argument(

            "--usan_supp_file", help="suppression file for undef behaviour sanitizer",

            default=None,

        )



    def run(self):
@@ -157,6 +161,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"],

                )

            IvasScriptsCommon.runner_setup(

                br.build_and_run_dict[check]["runner"], self.args
@@ -168,8 +173,10 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript): 
        if self.args["rebuild"] == True:

            br.force_build = True



        checks_ret_val = list()

        for check in checks:

            br.run(check)

            ret_val = br.run(check)

            checks_ret_val.append(ret_val)

            if self.args["create_html_output"]:

                cmd = ["git", "rev-parse", "HEAD"]

                commit_hash = subprocess.run(cmd, capture_output=True).stdout.decode("utf8")
@@ -194,11 +201,11 @@ class IvasBuildAndRunChecks(IvasScriptsCommon.IvasScript): 
            )



        returncode = 0

        for check in checks:

        for check, ret_val in zip(checks, checks_ret_val):

            runner = br.build_and_run_dict[check]["runner"]

            failed_encs = runner.failed_modes["enc"]

            failed_decs = runner.failed_modes["dec"]

            if len(failed_encs) > 0 or len(failed_decs) > 0:

            if len(failed_encs) > 0 or len(failed_decs) > 0 or ret_val != 0:

                returncode =  RET_CODE_FAILURE



        return returncode

scripts/parse_mld_xml.py

+5 −8
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ if __name__ == '__main__': 
    xml_report = args.xml_report

    csv_file   = args.csv_file



    mld = {}



    tree = ElementTree.parse(xml_report)



    testsuite = tree.find(".//testsuite")
@@ -27,12 +25,11 @@ if __name__ == '__main__': 


    with open(csv_file,'w') as outfile:

        for testcase in testcases:

            failure = testcase.find(".//failure")

            if failure is not None:

            fulltestname = testcase.get('file') + "::" + testcase.get('name')

            system_out = testcase.find(".//system-out")

            mld_val = 0

            if system_out is not None:

                for line in system_out.text.split('\n'):

                    if line.startswith('MLD:'):

                        mld_val = float(line.split()[1])

                        fulltestname = testcase.get('file') + "::" + testcase.get('name')

                        mld[fulltestname] = mld_val

            outfile.write(fulltestname + ';' + str(mld_val)+'\n')

scripts/pyivastest/IvasModeAnalyzer.py

+8 −2
Original line number Diff line number Diff line
@@ -759,6 +759,8 @@ class IvasModeAnalyzer(IvasModeCollector): 
        if num_total_errors == 0:

            self.logger.console("{} reports no errors".format(self.check), logging.INFO)



        return num_total_errors



    def get_valgrind_errors(self):



        total_vg_errors = 0
@@ -799,12 +801,16 @@ class IvasModeAnalyzer(IvasModeCollector): 
                ),

                logging.ERROR,

            )

        return build_errors



    def get_errors(self, failed_modes):

        """ """

        self.get_build_errors()

        n_build_err = self.get_build_errors()

        n_run_err = 0

        if self.check in ["CLANG1", "CLANG2", "CLANG3", "VALGRIND"]:

            self.get_run_errors(failed_modes)

            n_run_err = self.get_run_errors(failed_modes)



        return n_build_err, n_run_err



    def set_select_list(self, select_list):

        self.log_select_list = select_list