Commit 29bdd4a2 authored by norvell's avatar norvell
Browse files

Merge with using patched new tests

parents 98f8da44 1f5aedca

.gitlab-ci.yml

+29 −9
Original line number Diff line number Diff line
@@ -1200,7 +1200,7 @@ ivas-conformance: 
  stage: test

  timeout: "60 minutes"

  rules:

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'

    - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'

  allow_failure:

    exit_codes:

      - 123
@@ -1209,19 +1209,39 @@ ivas-conformance: 
    # Prepare reference exec, use tests and scripts from reference

    - source_branch_commit_sha=$(git rev-parse HEAD)

    - git checkout 20230815_RC02_SA4#125_delivery

    - sed -i".bak" "s/\(#define DEBUGGING\)/\/\/\1/" lib_com/options.h

    - make -j

    - cp IVAS_cod IVAS_cod_ref

    - cp IVAS_dec IVAS_dec_ref

    - cp IVAS_rend IVAS_rend_ref

    - cp -r tests tests_ref

    - cp -r scripts scripts_ref

    - git restore .

    - git checkout $source_branch_commit_sha

    - cp tests/test_26252.py tests_ref/test_26252.py



    - rm -r tests scripts

    - mv tests_ref tests 

    - mv scripts_ref scripts

    # remove unsupported testcases, in reverse row order 

    - sed -i '1657,1659d' scripts/config/self_test.prm

    - sed -i '1644,1655d' scripts/config/self_test.prm

    - sed -i '1623,1625d' scripts/config/self_test.prm

    - sed -i '1350,1353d' scripts/config/self_test.prm

    - sed -i '1307,1321d' scripts/config/self_test.prm

    - sed -i '1205,1213d' scripts/config/self_test.prm

    - sed -i '849,851d' scripts/config/self_test.prm

    - sed -i '805,807d' scripts/config/self_test.prm

    - sed -i '684,686d' scripts/config/self_test.prm

    - sed -i '420,422d' scripts/config/self_test.prm

    - sed -i '377,383d' scripts/config/self_test.prm

    - sed -i '321,329d' scripts/config/self_test.prm

    # Remove -fr option

    - sed -i '206,207d' tests/renderer/utils.py 

    # Revert to -tf option used in old IVAS_rend

    - sed -i '187s/-T/-tf/' tests/renderer/utils.py 

    # Exclude MASA1

    - sed -i '195s/"MASA1", //' tests/renderer/constants.py 

    # Change -pca to -bypass 2

    - sed -i '258s/-pca/-bypass 2/' tests/conftest.py 

    # Remove tests/renderer/test_renderer::test_masa_prerend

    - sed -i '239,246d' tests/renderer/test_renderer.py

    # Remove test_sba_pca

    - sed -i '88,153d' tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py



    # Reference creation

    - non_be_flag=0
@@ -1232,7 +1252,7 @@ ivas-conformance: 
    - python3 -m pytest tests/renderer/test_renderer_be_comparison.py # This run is needed for reference creation. renderer/cut/ can be ignored



    # Output creation

    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer_be_comparison.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?

    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?

    - python3 parse_commands.py report.html Readme_IVAS.txt

    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true