From 91b0bce95d2b24db912a0283b4f1215f78994144 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 22 Apr 2025 15:28:46 +0200
Subject: [PATCH 1/2] Align test cases with BASOP CI, affects test_sba.py and
 test_renderer.py

---
 .gitlab-ci.yml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3fbaf04204..8f0405f84b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,6 +32,12 @@ variables:
   BASOP_REFERENCE_BRANCH: "ivas-float-update"
   SCALE_FACTOR: "3.162"
   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: ""
 
 
 default:
@@ -468,7 +474,7 @@ branch-is-up-to-date-with-main-post:
   tags:
     - ivas-linux
   before_script:
-    - python3 ci/remove_unsupported_testcases.py $PARAM_FILE
+    - python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm scripts/config/self_test_ltv.prm
     - python3 tests/create_short_testvectors.py
     - python3 scripts/prepare_combined_format_inputs.py
 
@@ -477,9 +483,9 @@ branch-is-up-to-date-with-main-post:
 
     - *get-basop-float-reference
 
-    - python3 -m pytest tests/codec_be_on_mr_nonselection $PYTEST_ARGS --param_file $PARAM_FILE --update_ref 1 --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 || true
+    - python3 -m pytest $TEST_SUITE $PYTEST_ARGS --update_ref 1 --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 || true
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
-    - if [ $zero_errors != 1 ]; then echo "Run errors encountered with $PARAM_FILE !"; exit $EXIT_CODE_FAIL; fi
+    - if [ $zero_errors != 1 ]; then echo "Run errors encountered with TEST_SUITE=$TEST_SUITE !"; exit $EXIT_CODE_FAIL; fi
 
   artifacts:
     name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
@@ -498,7 +504,7 @@ basop-ref-compat-stv:
   extends:
     - .basop-ci-branch-compat-template
   variables:
-    PARAM_FILE: scripts/config/self_test.prm
+    TEST_SUITE: $SHORT_TEST_SUITE
     TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_STV_SANITIZERS
   script:
     - exit 0
@@ -509,7 +515,7 @@ basop-ref-compat-ltv:
   tags:
     - ivas-linux-fast
   variables:
-    PARAM_FILE: scripts/config/self_test_ltv.prm
+    TEST_SUITE: $LONG_TEST_SUITE
     TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_LTV_SANITIZERS
   script:
     - exit 0
@@ -518,7 +524,7 @@ basop-ref-compat-encoder-stv:
   extends:
     - .basop-ci-branch-compat-template
   variables:
-    PARAM_FILE: scripts/config/self_test_basop_encoder.prm
+    TEST_SUITE: $SHORT_TEST_SUITE_ENCODER
     TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_STV_SANITIZERS
   script:
     - exit 0
@@ -529,7 +535,7 @@ basop-ref-compat-encoder-ltv:
   tags:
     - ivas-linux-fast
   variables:
-    PARAM_FILE: scripts/config/self_test_ltv_basop_encoder.prm
+    TEST_SUITE: $LONG_TEST_SUITE_ENCODER
     TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_LTV_SANITIZERS
   script:
     - exit 0
@@ -538,7 +544,7 @@ basop-ref-compat-encoder-dmx-comp:
   extends:
     - .basop-ci-branch-compat-template
   variables:
-    PARAM_FILE: scripts/config/self_test_basop_encoder.prm
+    TEST_SUITE: $SHORT_TEST_SUITE_ENCODER
     # USING PYTEST_ADDOPTS env var did not work for some reason when testing locally - maybe because this is a custom option
     PYTEST_ARGS: "--compare_enc_dmx"
     TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_STV_SANITIZERS
-- 
GitLab


From e02ef396e9cb8fbac526f346bbf76506444ec25e Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Tue, 22 Apr 2025 17:05:39 +0200
Subject: [PATCH 2/2] Include renderer tests in basop-ref-compat-stv

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f0405f84b..18e5190116 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -504,7 +504,7 @@ basop-ref-compat-stv:
   extends:
     - .basop-ci-branch-compat-template
   variables:
-    TEST_SUITE: $SHORT_TEST_SUITE
+    TEST_SUITE: "$SHORT_TEST_SUITE tests/renderer"
     TESTCASE_TIMEOUT: $TESTCASE_TIMEOUT_STV_SANITIZERS
   script:
     - exit 0
-- 
GitLab