From a4d3a1ca43acad36f1677f6c506846c07c5a1a8a Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Fri, 17 Apr 2026 16:35:08 +0200 Subject: [PATCH 1/2] Remove renderer_short from conformance scripts --- scripts/ivas_conformance/README.md | 2 +- scripts/ivas_conformance/ivas_be_conf_test_gen.sh | 4 ++-- scripts/ivas_conformance/runConformance.py | 4 ++-- scripts/rend_header.txt | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/ivas_conformance/README.md b/scripts/ivas_conformance/README.md index 884611e0a..e7f03aac7 100644 --- a/scripts/ivas_conformance/README.md +++ b/scripts/ivas_conformance/README.md @@ -96,7 +96,7 @@ CUT_OUTPUTS +- failedCmds.txt : Log of all the shell commands that failed execution +- dec/ : Folder containing all decoder tests CUT outputs +- enc/ : Folder containing all encoder tests CUT outputs - +- renderer_short/ : Folder containing all renderer tests CUT outputs + +- renderer/ : Folder containing all renderer tests CUT outputs +- split_rendering/ : Folder containing all split rendering enc/dec tests ``` diff --git a/scripts/ivas_conformance/ivas_be_conf_test_gen.sh b/scripts/ivas_conformance/ivas_be_conf_test_gen.sh index 6e7f2bb55..0e2f191bf 100644 --- a/scripts/ivas_conformance/ivas_be_conf_test_gen.sh +++ b/scripts/ivas_conformance/ivas_be_conf_test_gen.sh @@ -14,7 +14,7 @@ rm -rf testvec mkdir testvec mkdir testvec/binauralRenderer_interface mkdir testvec/testv -mkdir testvec/testv/renderer_short +mkdir testvec/testv/renderer mkdir testvec/testv/split_rendering mkdir testvec/bin cp -r scripts/testv/* testvec/testv @@ -24,7 +24,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/ref testvec/testv/renderer_short/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 diff --git a/scripts/ivas_conformance/runConformance.py b/scripts/ivas_conformance/runConformance.py index 3fe69b180..56c798412 100644 --- a/scripts/ivas_conformance/runConformance.py +++ b/scripts/ivas_conformance/runConformance.py @@ -828,7 +828,7 @@ class MLDConformance: "$CUT_PATH/ref/param_file/", f"{self.testvDir}/ref/param_file/" ) command = command.replace( - "$CUT_PATH/renderer_short/ref/", f"{self.testvDir}/renderer_short/ref/" + "$CUT_PATH/renderer/ref/", f"{self.testvDir}/renderer/ref/" ) command = command.replace( "$CUT_PATH/split_rendering/ref", @@ -845,7 +845,7 @@ class MLDConformance: "$CUT_PATH/ref/param_file/dec/", f"{self.outputDir}/dec/" ) command = command.replace( - "$CUT_PATH/renderer_short/ref/", f"{self.outputDir}/renderer_short/ref/" + "$CUT_PATH/renderer/ref/", f"{self.outputDir}/renderer/ref/" ) command = command.replace( "$CUT_PATH/split_rendering/cut/", diff --git a/scripts/rend_header.txt b/scripts/rend_header.txt index ce2e274c6..a83b0a17b 100644 --- a/scripts/rend_header.txt +++ b/scripts/rend_header.txt @@ -15,7 +15,7 @@ LOG_FILE=Readme_IVAS_rend_log.txt rm -rf tmp rm -rf $CUT_PATH -mkdir -p $CUT_PATH/renderer_short/ref -mkdir -p $CUT_PATH/renderer_short/data +mkdir -p $CUT_PATH/renderer/ref +mkdir -p $CUT_PATH/renderer/data -- GitLab From f30a8ba6ed47223c316d4fcfb55a09104a291923 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Fri, 17 Apr 2026 17:39:51 +0200 Subject: [PATCH 2/2] Set test ci branch --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01a59853c..76ed6e06b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information - IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF deduplicate-renderer-tests + IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF ci/test-remove-renderer-short # If you need to set some config variable only in a local branch, then add an overwrite here # One example is DISABLE_HRTF - this will be set on a branch which is about to be merged and will be removed in a subsequent second MR # this is more easily done directly here in the child repo -- GitLab