Commit f97bb51e authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[ci] pytest.ini - prevent pytest from running renderer tests 

- comment out external-renderer-cmake-vs-decoder-pytest and move to
  tests/renderer/run_test_renderer_vs_decoder.sh
- add .external-renderer-pytest-on-merge-request to be enabled after
  merge to main
parent 53d4d17e

.gitlab-ci.yml

+30 −1
Original line number Diff line number Diff line
@@ -372,7 +372,8 @@ external-renderer-cmake-msan-pytest: 
        - report-junit.xml



# test external renderer executable with cmake vs decoder renderer

external-renderer-cmake-vs-decoder-pytest:

# TODO @tmu @knj @sgi -> converted to script, decide whether to re-enable later

.external-renderer-cmake-vs-decoder-pytest:

  extends:

    - .test-job-linux

    - .rules-merge-request
@@ -392,6 +393,34 @@ external-renderer-cmake-vs-decoder-pytest: 
      junit:

        - report-junit.xml



# compare external renderer bitexactness between target and source branch

# TODO @knj please update

.external-renderer-pytest-on-merge-request:

  extends:

    - .test-job-linux

    - .rules-merge-request

  needs: ["build-codec-linux-make"]

  stage: compare

  script:

    - make -j IVAS_rend

    - make -j unittests

    - make -j --directory scripts/td_object_renderer/object_renderer_standalone

    - git checkout main

    - python3 -m pytest -q --log-level ERROR -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py

    - mv tests/renderer/ref tests/renderer/ref_main

    - git checkout FhG/external-renderer 

    - python3 -m pytest -q --log-level ERROR -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py

    - python scripts/batch_comp_audio.py ./tests/renderer/ref_main ./tests/renderer/ref

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    when: always

    paths:

      - report-junit.xml

    expose_as: "external renderer pytest on merge request results"

    reports:

      junit:

        - report-junit.xml



# compare bit exactness between target and source branch

ivas-pytest-on-merge-request:

  extends:

pytest.ini

+2 −1
Original line number Diff line number Diff line 
# pytest.ini

# note: per convention, this file is placed in the root directory of the repository

[pytest]

addopts = -ra --tb=short --basetemp=./tmp -n auto -v

# TODO remove ignore after tests are harmonized

addopts = -ra --tb=short --basetemp=./tmp -n auto -v --ignore=tests/renderer

# Write captured system-out log messages to JUnit report.

junit_logging = system-out

# Do not capture log information for passing tests to JUnit report.

tests/renderer/run_test_renderer_vs_decoder.sh

0 → 100755
+10 −0
Original line number Diff line number Diff line 
#!/bin/bash



# WARNING! This script is a temporary helper, ideally these steps should be done manually and the pytest suite also run manually

cd ../../

mkdir build

cmake -B build -G "Unix Makefiles" -DDEC_TO_REND_FLOAT_DUMP=true -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true

cmake --build build -- -j

python3 -m pytest -q -n 1 -rA tests/renderer/test_renderer_vs_decoder.py



echo "WARNING! Existing executables in root were overwritten!"