Commit 243b70f8 authored by Jan Kiene's avatar Jan Kiene
Browse files

use artifact collection script in wrapper script

parent 2ee7ea13
Loading
Loading
Loading
Loading
+23 −7
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ MC_MODES = ["5_1", "5_1_2", "5_1_4", "7_1", "7_1_4"]

SCRIPT_DIR = pathlib.Path("./scripts").resolve()

COLLECT_ARTIFACTS_SCRIPT = "ci/collect_artifacts.py"
CONSOLE_OUT_FILE = "output_san.txt"


def main(args):
    in_format = args.in_format
@@ -28,6 +31,8 @@ def main(args):
    modes = get_modes(in_format)
    returncode = run_check(modes, out_formats, tests, run_fec=run_fec)

    cmd_collect_artifacts = [COLLECT_ARTIFACTS_SCRIPT, "sanitizers", CONSOLE_OUT_FILE]

    sys.exit(returncode)


@@ -37,7 +42,7 @@ def get_modes(in_format: str) -> list:
        SCRIPT_DIR.joinpath("runIvasCodec.py"),
        "-C",
        "MC" if in_format in MC_MODES else in_format,
            "-l"
        "-l",
    ]
    list_process = subprocess.run(cmd, capture_output=True)

@@ -70,9 +75,16 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True)
        *modes,
        "--oc",
        *out_formats,
        "|",
        "tee",
        CONSOLE_OUT_FILE,
    ]

    print("======== Script command line WITHOUT plc: ========\n{}".format(" ".join(cmd_no_fec)))
    print(
        "======== Script command line WITHOUT plc: ========\n{}".format(
            " ".join(cmd_no_fec)
        )
    )

    proc = subprocess.Popen(cmd_no_fec, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    for c in iter(lambda: proc.stdout.read(1), b""):
@@ -109,7 +121,11 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True)
            path.mkdir()

    cmd_fec = cmd_no_fec + ["--decoder_only", "-f", EP_FILE]
    print("======== Script command line WITH plc: ========\n{}".format(" ".join(cmd_no_fec)))
    print(
        "======== Script command line WITH plc: ========\n{}".format(
            " ".join(cmd_no_fec)
        )
    )

    proc = subprocess.Popen(cmd_fec, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    for c in iter(lambda: proc.stdout.read(1), b""):