From aeddbd3c076f144c06de63ac1d40c4b220edc176 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 27 Nov 2025 10:46:25 +0100 Subject: [PATCH 1/2] add LONG_TEST_SUITE_RENDERER_SHORT var for ltv tests --- includes/default-variables-basop.yml | 6 ------ includes/default-variables-float.yml | 6 ------ includes/default-variables.yml | 7 +++++++ main-basop.yml | 14 +++++++------- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/includes/default-variables-basop.yml b/includes/default-variables-basop.yml index e9aee3e..8775d85 100644 --- a/includes/default-variables-basop.yml +++ b/includes/default-variables-basop.yml @@ -3,12 +3,6 @@ variables: # TODO: cleanup and use global var defined in ivas-codec-ci FLOAT_REF_BRANCH_MERGE_SOURCE: "" SCRIPTS_DIR: "/usr/local/scripts" - LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --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" - LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm" - TEST_SUITE: "" # These path variables are used by the pytest calls. # They can be overwritten in the job templates to e.g. only test encoder or decoder in the chain DUT_ENCODER_PATH: "./IVAS_cod_dut" diff --git a/includes/default-variables-float.yml b/includes/default-variables-float.yml index 9baec3b..2416e15 100644 --- a/includes/default-variables-float.yml +++ b/includes/default-variables-float.yml @@ -22,12 +22,6 @@ variables: - 'complexity' PYTEST_ARGS: "" - LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --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" - LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm" - TEST_SUITE: "" COVERAGE_OUTPUT_FILE_STV: "coverage-stv.info" COVERAGE_OUTPUT_FILE_LTV: "coverage-ltv.info" COVERAGE_OUTPUT_FILE_CONFORMANCE: "coverage-conformance.info" diff --git a/includes/default-variables.yml b/includes/default-variables.yml index d72bce4..2df074c 100644 --- a/includes/default-variables.yml +++ b/includes/default-variables.yml @@ -17,3 +17,10 @@ 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_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" + LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm" + TEST_SUITE: "" diff --git a/main-basop.yml b/main-basop.yml index 2e62484..ead714c 100644 --- a/main-basop.yml +++ b/main-basop.yml @@ -2032,7 +2032,7 @@ ivas-pytest-compare_ref-long-enc: - LEVEL_SCALING=1.0 - SPLIT_COMPARISON="true" <<: *compare-to-ref-anchor - + ivas-pytest-compare_ref-long-dec: extends: - .rules-pytest-long @@ -2043,11 +2043,11 @@ ivas-pytest-compare_ref-long-dec: before_script: - USE_LTV=1 - DUT_ENCODER_PATH=./$REF_ENCODER_PATH - - TEST_SUITE="$LONG_TEST_SUITE" + - TEST_SUITE="$LONG_TEST_SUITE_RENDERER_SHORT" - LEVEL_SCALING=1.0 - SPLIT_COMPARISON="true" <<: *compare-to-ref-anchor - + ivas-pytest-compare_ref-long-enc-lev-10: extends: - .rules-pytest-long @@ -2059,7 +2059,7 @@ ivas-pytest-compare_ref-long-enc-lev-10: - LEVEL_SCALING=0.3162 - SPLIT_COMPARISON="true" <<: *compare-to-ref-anchor - + ivas-pytest-compare_ref-long-dec-lev-10: extends: - .rules-pytest-long @@ -2070,7 +2070,7 @@ ivas-pytest-compare_ref-long-dec-lev-10: before_script: - USE_LTV=1 - DUT_ENCODER_PATH=./$REF_ENCODER_PATH - - TEST_SUITE="$LONG_TEST_SUITE" + - TEST_SUITE="$LONG_TEST_SUITE_RENDERER_SHORT" - LEVEL_SCALING=0.3162 - SPLIT_COMPARISON="true" <<: *compare-to-ref-anchor @@ -2086,7 +2086,7 @@ ivas-pytest-compare_ref-long-enc-lev+10: - LEVEL_SCALING=3.162 - SPLIT_COMPARISON="true" <<: *compare-to-ref-anchor - + ivas-pytest-compare_ref-long-dec-lev+10: extends: - .rules-pytest-long @@ -2097,7 +2097,7 @@ ivas-pytest-compare_ref-long-dec-lev+10: before_script: - USE_LTV=1 - DUT_ENCODER_PATH=./$REF_ENCODER_PATH - - TEST_SUITE="$LONG_TEST_SUITE" + - TEST_SUITE="$LONG_TEST_SUITE_RENDERER_SHORT" - LEVEL_SCALING=3.162 - SPLIT_COMPARISON="true" <<: *compare-to-ref-anchor -- GitLab From 49f059c774cdacade1ea0aa6ea1fe38baec3912e Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 8 Dec 2025 15:05:13 +0100 Subject: [PATCH 2/2] remove obsolete variable definitions --- main-basop.yml | 6 ------ main-float.yml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/main-basop.yml b/main-basop.yml index 5cbfd93..1200deb 100644 --- a/main-basop.yml +++ b/main-basop.yml @@ -25,12 +25,6 @@ variables: EVS_BE_TEST_DIR_BASOP: "/usr/local/be_2_evs_basop" FLOAT_REF_BRANCH_MERGE_SOURCE: "" SCRIPTS_DIR: "/usr/local/scripts" - LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --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" - LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm" - TEST_SUITE: "" ### These path variables are used by the pytest calls. ### They can be overwritten in the job definitions in the variables: section to e.g. only test encoder or decoder in the chain ### E.g. a job that tests the BASOP encoder against the float ref via MLD etc. would overwrite DUT_DECODER_PATH with REF_DECODER_PATH in its variables: section diff --git a/main-float.yml b/main-float.yml index 5195bbb..c044823 100644 --- a/main-float.yml +++ b/main-float.yml @@ -45,12 +45,6 @@ variables: - 'complexity' PYTEST_ARGS: "" - LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --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" - LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm" - TEST_SUITE: "" COVERAGE_OUTPUT_FILE_STV: "coverage-stv.info" COVERAGE_OUTPUT_FILE_LTV: "coverage-ltv.info" COVERAGE_OUTPUT_FILE_CONFORMANCE: "coverage-conformance.info" -- GitLab