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

change test/renderer_short -> tests/renderer/test_renderer_short.py

parent 14d92e69
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ variables:
  DISABLE_HRTF: "false"
  PROJECT_ID_FLOAT: "49"
  PROJECT_ID_BASOP: "77"
  LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --param_file scripts/config/self_test_ltv.prm --use_ltv"
  LONG_TEST_SUITE_RENDERER_SHORT: "tests/codec_be_on_mr_nonselection tests/renderer_short --param_file scripts/config/self_test_ltv.prm --use_ltv"
  LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py --param_file scripts/config/self_test_ltv.prm --use_ltv"
  LONG_TEST_SUITE_RENDERER_SHORT: "tests/codec_be_on_mr_nonselection tests/renderer/test_renderer_short.py --param_file scripts/config/self_test_ltv.prm --use_ltv"
  LONG_TEST_SUITE_NO_RENDERER: "tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_ltv.prm --use_ltv"
  SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"
  SHORT_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"
+7 −7
Original line number Diff line number Diff line
@@ -1361,13 +1361,13 @@ renderer-pytest-on-merge-request:
    - exit_code=0
    - testcase_timeout=60
    - python3 tests/create_short_testvectors.py --cut_len 5.0 --all --inplace
    - python3 -m pytest -q --log-level ERROR -n auto -rA tests/renderer_short/test_renderer.py --create_ref --testcase_timeout=$testcase_timeout || exit_code=$?
    - python3 -m pytest -q --log-level ERROR -n auto -rA tests/renderer/test_renderer_short.py --create_ref --testcase_timeout=$testcase_timeout || exit_code=$?

    ### Run test using branch scripts and input
    - if [ $ref_using_target == 1 ]; then git checkout $source_branch_commit_sha; fi

    # run test
    - python3 -m pytest -q --log-level ERROR -n auto -rA --mld --ssnr --odg --html=$REPORT_HTML --self-contained-html --junit-xml=$REPORT_XML tests/renderer_short/test_renderer.py --create_cut --testcase_timeout=$testcase_timeout || exit_code=$?
    - python3 -m pytest -q --log-level ERROR -n auto -rA --mld --ssnr --odg --html=$REPORT_HTML --self-contained-html --junit-xml=$REPORT_XML tests/renderer/test_renderer_short.py --create_cut --testcase_timeout=$testcase_timeout || exit_code=$?
    - zero_errors=$(cat $REPORT_XML | grep -c 'errors="0"') || true

    - python3 scripts/parse_xml_report.py $REPORT_XML $REPORT_CSV
@@ -1722,7 +1722,7 @@ renderer-smoke-test:
    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
    - make -j IVAS_rend 2>&1 >$MAKE_BUILD_LOG_FILE_DEFAULT
    - testcase_timeout=60
    - python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer_short/test_renderer.py --testcase_timeout=$testcase_timeout
    - python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer_short.py --testcase_timeout=$testcase_timeout
  artifacts:
    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
    expire_in: 1 week
@@ -1747,7 +1747,7 @@ renderer-smoke-test:
    - make clean
    - make -j 2>&1 >$MAKE_BUILD_LOG_FILE_DEFAULT
    - testcase_timeout=180
    - python3 -m pytest -q -n auto --tb=no --junit-xml=report-junit.xml tests/renderer_short/test_renderer.py --testcase_timeout=$testcase_timeout
    - python3 -m pytest -q -n auto --tb=no --junit-xml=report-junit.xml tests/renderer/test_renderer_short.py --testcase_timeout=$testcase_timeout

  artifacts:
    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
@@ -1776,7 +1776,7 @@ renderer-smoke-test:
    - make clean
    - make -j 2>&1 >$MAKE_BUILD_LOG_FILE_DEFAULT
    - testcase_timeout=180
    - python3 -m pytest -q -n auto --tb=no --junit-xml=report-junit.xml tests/renderer_short/test_renderer.py --testcase_timeout=$testcase_timeout
    - python3 -m pytest -q -n auto --tb=no --junit-xml=report-junit.xml tests/renderer/test_renderer_short.py --testcase_timeout=$testcase_timeout

  artifacts:
    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
@@ -1806,7 +1806,7 @@ renderer-smoke-test:
    - python3 scripts/basop_create_ignorelist_for_ubsan.py
    - make -j CLANG=3 IGNORELIST=1 2>&1 >$MAKE_BUILD_LOG_FILE_DEFAULT
    - testcase_timeout=180
    - UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1,print_stacktrace=1,log_path=usan_log_catchall python3 -m pytest -q -n auto --tb=no --junit-xml=report-junit.xml tests/renderer_short/test_renderer.py --testcase_timeout=$testcase_timeout
    - UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1,print_stacktrace=1,log_path=usan_log_catchall python3 -m pytest -q -n auto --tb=no --junit-xml=report-junit.xml tests/renderer/test_renderer_short.py --testcase_timeout=$testcase_timeout
    - grep_exit_code=0
    - touch usan_log_empty # Creates an empty file, this is to avoid "grep: usan_log_*: No such file or directory" in case no USAN failures are reported from pytest
    - grep UndefinedBehaviorSanitizer usan_log_* || grep_exit_code=$?
@@ -2594,7 +2594,7 @@ ivas-pytest-renderer:
    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-renderer"
  before_script:
    - USE_LTV=0
    - TEST_SUITE="tests/renderer"
    - TEST_SUITE="tests/renderer/test_renderer.py"
  <<: *compare-to-ref-anchor

peaq-enc-passthrough:
+6 −6
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ branch-is-up-to-date-with-main-post:

    # BASOP renderer test uses cut input signals
    - |
      if [ "$TEST_SUITE" == "tests/renderer_short/test_renderer.py" ]; then
      if [ "$TEST_SUITE" == "tests/renderer/test_renderer_short.py" ]; then
        python3 tests/create_short_testvectors.py --inplace --all --cut_len 5.0
      fi
    - python3 -m pytest $TEST_SUITE $PYTEST_ARGS --update_ref 1 --create_ref --ref_encoder_path IVAS_cod --ref_decoder_path IVAS_dec --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout
@@ -327,7 +327,7 @@ basop-compat-stv:
    matrix:
      - TEST_SUITE:
        - tests/codec_be_on_mr_nonselection/test_param_file.py
        - tests/renderer_short/test_renderer.py
        - tests/renderer/test_renderer_short.py

  script:
    - exit 0
@@ -1285,7 +1285,7 @@ ivas-conformance:

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

@@ -1310,7 +1310,7 @@ ivas-conformance:
    - cp -r -force -ErrorAction Ignore scripts/trajectories testvec
    - cp -r -force -ErrorAction Ignore scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
    - cp -r -force -ErrorAction Ignore tests/ref testvec/testv/ref
    - cp -r -force -ErrorAction Ignore tests/renderer_short/ref testvec/testv/renderer_short/ref
    - cp -r -force -ErrorAction Ignore tests/renderer/ref testvec/testv/renderer_short/ref
    - cp -r -force -ErrorAction Ignore tests/split_rendering/ref testvec/testv/split_rendering/ref
    - cp -r -force -ErrorAction Ignore tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs
    - cp -r -force -ErrorAction Ignore tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns
@@ -1381,7 +1381,7 @@ ivas-conformance-linux:

    # Reference creation
    - python3 scripts/prepare_combined_format_inputs.py
    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer_short/test_renderer.py tests/split_rendering/test_split_rendering.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

@@ -1400,7 +1400,7 @@ ivas-conformance-linux:
    - 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_short/ref testvec/testv/renderer_short/ref
    - cp -r tests/renderer/ref testvec/testv/renderer_short/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
+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ cp IVAS_rend IVAS_rend_ref
cp ISAR_post_rend ISAR_post_rend_ref

# Reference creation
python3 -m pytest -q tests/codec_be_on_mr_nonselection tests/renderer_short/test_renderer.py tests/split_rendering/test_split_rendering.py -n auto --update_ref 1 --create_ref --keep_files --html=report_cmd.html --self-contained-html
python3 -m pytest -q tests/codec_be_on_mr_nonselection tests/renderer/test_renderer_short.py tests/split_rendering/test_split_rendering.py -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
@@ -26,7 +26,7 @@ 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_short/ref testvec/testv/renderer_short/ref
cp -r tests/renderer/ref testvec/testv/renderer_short/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