Commit f3fad787 authored by Jan Kiene's avatar Jan Kiene
Browse files

fix build in anchor

parent 4496daaf

.gitlab-ci.yml

+10 −26
Original line number Diff line number Diff line
@@ -85,15 +85,18 @@ workflow: 
.merge-request-comparison-setup-codec: &merge-request-comparison-setup-codec 

  ### build test binaries, initial clean for paranoia reasons

  - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/disable-debugging-macro.sh

  - *get-ivas-float-update

  - pushd ivas-basop

  - make clean

  - mkdir build

  - cd build

  - cmake ..

  - make -j

  - mv IVAS_cod ../IVAS_cod_test

  - mv IVAS_dec ../IVAS_dec_test

  - mv IVAS_rend ../IVAS_rend_test

  - mv IVAS_cod ../../IVAS_cod_test

  - mv IVAS_dec ../../IVAS_dec_test

  - mv IVAS_rend ../../IVAS_rend_test

  - cd ..

  - popd

  - rm -rf build/*

  - git restore .
@@ -150,8 +153,12 @@ workflow: 
  script:

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/copy-ltv-files-to-testv-dir.sh

    - *get-ivas-float-update

    - pushd ivas-basop

    - make clean

    - make -j CLANG=$CLANG_NUM

    - cp IVAS_* ../

    - popd

    - testcase_timeout=$SELFTEST_SANITY_TIMEOUT

    - export UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1,print_stacktrace=1
@@ -664,11 +671,6 @@ renderer-pytest-on-merge-request: 
    ### Run test using branch scripts and input

    - if [ $ref_using_main == 1 ]; then git checkout $source_branch_commit_sha; fi



    - *get-ivas-float-update

    - pushd ivas-basop

    - make -j IVAS_rend

    - cp IVAS_rend ../

    - popd

    # run test

    - python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/renderer/test_renderer.py --create_cut --testcase_timeout=$testcase_timeout || exit_code=$?

    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
@@ -889,12 +891,6 @@ ivas-pytest-on-merge-request: 
    ### Run test using branch scripts and input

    - if [ $ref_using_main == 1 ]; then git checkout $source_branch_commit_sha; fi



    - *get-ivas-float-update

    - pushd ivas-basop

    - make -j

    - cp IVAS_* ../

    - popd



    ### run pytest

    - exit_code=0

    - testcase_timeout=60
@@ -941,12 +937,6 @@ ivas-interop-on-merge-request: 


    ### prepare pytest



    - *get-ivas-float-update

    - pushd ivas-basop

    - make -j

    - cp IVAS_cod ../

    - popd



    # Run reference creation, using source branch encoder and main decoder (see .merge-request-comparison-setup-codec)

    - exit_code=0

    - exit_code2=0
@@ -1004,12 +994,6 @@ evs-pytest-on-merge-request: 
    ### Run test using branch scripts and input

    - if [ $ref_using_main == 1 ]; then git checkout $source_branch_commit_sha; fi



    - *get-ivas-float-update

    - pushd ivas-basop

    - make -j

    - cp IVAS_* ../

    - popd



    ### run pytest for EVS cases

    - exit_code=0

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v --param_file scripts/config/self_test_evs.prm --html=report.html --self-contained-html --junit-xml=report-junit-evs.xml --testcase_timeout=$testcase_timeout || exit_code=$?