Unverified Commit 14c48af0 authored by norvell's avatar norvell
Browse files

Use run_conformance.py in ivas-conformance-linux job

parent a48e605d
Loading
Loading
Loading
Loading
+3 −53
Original line number Diff line number Diff line
@@ -1456,49 +1456,7 @@ ivas-conformance-linux:
    COVERAGE_TITLE: "conformance test test_26252.py"
  script:
    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
    - make -j
    - cp IVAS_cod IVAS_cod_ref
    - cp IVAS_dec IVAS_dec_ref
    - cp IVAS_rend IVAS_rend_ref
    - cp ISAR_post_rend ISAR_post_rend_ref

    # Reference creation
    - python3 scripts/prepare_combined_format_inputs.py
    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer_short.py tests/split_rendering/test_split_rendering.py"
    - python3 -m pytest -q $TEST_SET -n auto --update_ref 1 --create_ref --keep_files --html=report_cmd.html --self-contained-html
    - python3 scripts/parse_commands.py report_cmd.html Readme_IVAS.txt

    # Copy input data and output ref data
    - rm -rf testvec
    - mkdir testvec
    - mkdir testvec/binauralRenderer_interface
    - mkdir testvec/testv
    - mkdir testvec/testv/renderer
    - mkdir testvec/testv/split_rendering
    - mkdir testvec/bin
    - cp -r scripts/testv/* testvec/testv
    - cp -r scripts/ls_layouts testvec
    - cp -r scripts/object_edit testvec
    - cp -r scripts/switchPaths testvec
    - cp -r scripts/trajectories testvec
    - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
    - cp -r tests/ref testvec/testv/ref
    - cp -r tests/renderer/ref testvec/testv/renderer/ref
    - cp -r tests/split_rendering/ref testvec/testv/split_rendering/ref
    - cp -r tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs
    - cp -r tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns

    # Remove redundant files
    - python3 scripts/cleanup_26252.py

    # Copy test script files
    - cp -r tests/conformance-test testvec/
    - cp Readme_IVAS_dec.txt testvec
    - cp Readme_IVAS_enc.txt testvec
    - cp Readme_IVAS_rend.txt testvec
    - cp Readme_IVAS_JBM_dec.txt testvec
    - cp Readme_IVAS_ISAR_dec.txt testvec
    - cp Readme_IVAS_ISAR_post_rend.txt testvec
    - bash scripts/ivas_conformance/ivas_be_conf_test_gen.sh
    
    # Create coverage instrumented execs for coverage analysis
    - make clean
@@ -1510,16 +1468,12 @@ ivas-conformance-linux:
    - cp ISAR_post_rend testvec/bin

    # Test run generated scripts in testvec
    - cd testvec
    - exit_code=0
    - python3 -m pytest -q conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
    - mv report.html ..
    - mv report-junit.xml ..
    - PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --cut_build_path=testvec/bin || exit_code=$?

    # Collect coverage
    - cd -
    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/collect-coverage.sh --obj-dir obj --output-file $COVERAGE_OUTPUT_FILE --output-dir $COVERAGE_OUTPUT_DIR --title "Coverage on main -- $COVERAGE_TITLE"

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-sizes.sh report_cmd.html report-junit.xml report.html Readme_IVAS_dec.txt Readme_IVAS_enc.txt Readme_IVAS_rend.txt Readme_IVAS_JBM_dec.txt Readme_IVAS_ISAR_dec.txt Readme_IVAS_ISAR_post_rend.txt $COVERAGE_OUTPUT_FILE $COVERAGE_OUTPUT_DIR $MAKE_BUILD_LOG_FILE_DEFAULT

    # Check for failures
@@ -1531,8 +1485,6 @@ ivas-conformance-linux:
    when: always
    paths:
      - report_cmd.html
      - report-junit.xml
      - report.html
      - Readme_IVAS_dec.txt
      - Readme_IVAS_enc.txt
      - Readme_IVAS_rend.txt
@@ -1543,8 +1495,6 @@ ivas-conformance-linux:
      - $COVERAGE_OUTPUT_DIR
      - $MAKE_BUILD_LOG_FILE_DEFAULT
    expose_as: "Draft IVAS conformance -- Linux"
    reports:
      junit: report-junit.xml

test-long-self-test:
  extends: