Commit 7a7e5164 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'ci-and-script-adaptations' into 'main' 

Ci and script adaptations

See merge request !299
parents 4353d954 76b85009

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -965,6 +965,7 @@ coverage-test-on-main-scheduled: 
  - sed -i "s/IVAS FORMAT/IVAS $in_format to $out_format/g" ${public_dir}/index.html

  # do separately here to avoid overwrite complaints by mv

  - mv -f ci/complexity_measurements/style.css ${public_dir}/

  - ls $public_dir



.complexity-template:

  extends:

ci/collect_artifacts.py

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ def collect_for_sanitizer_test(file): 
    )

    files_to_archive = find_failed_files_for_sanitizer_test(console_log, "logs")



    print("files_to_archive_noPLC:", files_to_archive_noPLC)

    print("files_to_archive:", files_to_archive)



    log_folder = pathlib.Path("./LOGS_PLC")

    log_folder.mkdir()

    for test in files_to_archive.keys():

scripts/pyivastest/IvasScriptsCommon.py

+17 −4
Original line number Diff line number Diff line
@@ -544,12 +544,18 @@ def runner_setup(runner, args): 
        runner.limit_duration = True

        runner.max_duration = args["limit_duration"]



    if "fer_file" in args.keys() or "ber_file" in args.keys():

        # assert that the eid-xor tool is there

        eid_xor_path = os.path.join(runner.config["utilPath"], "eid-xor")

        if not os.path.isfile(eid_xor_path):

            raise FileNotFoundError(f"Could not find {eid_xor_path} (needed for error pattern insertion)")



    if args["fer_file"]:

        fer_suffix = "fer_{}".format(

            "_".join(os.path.basename(args["fer_file"]).split("."))

        )

        fer_cmd = [

            os.path.join(runner.config["utilPath"], "eid-xor"),

            eid_xor_path,

            "-vbr",

            "-fer",

            "{in_file}",
@@ -564,7 +570,7 @@ def runner_setup(runner, args): 
            "_".join(os.path.basename(args["ber_file"]).split("."))

        )

        ber_cmd = [

            os.path.join(runner.config["utilPath"], "eid-xor"),

            eid_xor_path,

            "-vbr",

            "-ber",

            "{in_file}",
@@ -634,12 +640,19 @@ def runner_setup(runner, args): 


def analyzer_setup(analyzer, args):

    bs_proc_chain = {}



    if "fer_file" in args.keys() or "ber_file" in args.keys():

        # assert that the eid-xor tool is there

        eid_xor_path = os.path.join(analyzer.config["utilPath"], "eid-xor")

        if not os.path.isfile(eid_xor_path):

            raise FileNotFoundError(f"Could not find {eid_xor_path} (needed for error pattern insertion)")



    if args["fer_file"]:

        fer_suffix = "fer_{}".format(

            "_".join(os.path.basename(args["fer_file"]).split("."))

        )

        fer_cmd = [

            os.path.join(analyzer.config["utilPath"], "eid-xor"),

            eid_xor_path,

            "-vbr",

            "-fer",

            "{in_file}",
@@ -654,7 +667,7 @@ def analyzer_setup(analyzer, args): 
            "_".join(os.path.basename(args["ber_file"]).split("."))

        )

        ber_cmd = [

            os.path.join(analyzer.config["utilPath"], "eid-xor"),

            eid_xor_path,

            "-vbr",

            "-ber",

            "{in_file}",