Commit 4a1cfbcc authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'sanitizer-test-adaptations' into 'main' 

Minor tweaks for sanitizer tests

See merge request !122
parents 25e0e3f9 26e87b43

.gitlab-ci.yml

+8 −2
Original line number Diff line number Diff line
@@ -468,9 +468,15 @@ sanitizer-test-on-main-scheduled: 
    - if: $SANITIZER_TEST_IN_FMT && $SANITIZER_TEST_OUT_FMTS && $SANITIZER_TEST_TESTS

  script:

    - *print-common-info

    - echo "Running scheduled sanitizer"

    - echo " $SANITIZER_TEST_IN_FMT && $SANITIZER_TEST_OUT_FMTS && $SANITIZER_TEST_TESTS "

    - echo "Running scheduled sanitizer tests $SANITIZER_TEST_TESTS for input format $SANITIZER_TEST_IN_FMT and output format(s) $SANITIZER_TEST_OUT_FMTS"



    - python3 ci/run_scheduled_sanitizer_test.py $SANITIZER_TEST_IN_FMT $SANITIZER_TEST_OUT_FMTS --tests $SANITIZER_TEST_TESTS

  artifacts:

    name: "sanitizer-test-results-and-error_pattern-$SANITIZER_TEST_IN_FMT-in-$SANITIZER_TEST_OUT_FMTS-out"

    when: always

    paths:

      - ep_015.g192

      - "./*/logs"





# ---------------------------------------------------------------

ci/run_scheduled_sanitizer_test.py

+3 −2
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True) 
        "--oc",

        *out_formats,

    ]

    print(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""):
@@ -89,7 +90,7 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True) 
                fi.unlink()



    cmd_fec = cmd_no_fec + ["--decoder_only", "-f", EP_FILE]

    print(cmd_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""):