Commit 9d69abdc authored by norvell's avatar norvell
Browse files

Merge branch 'ci/deduplicate-renderer-tests-conformance-test' into 'ci/deduplicate-renderer-tests' 

Ci/deduplicate renderer tests conformance test

See merge request !2590
parents 113f6c2c f30a8ba6

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
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

scripts/ivas_conformance/README.md

+1 −1
Original line number Diff line number Diff line
@@ -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

```

scripts/ivas_conformance/ivas_be_conf_test_gen.sh

+2 −2
Original line number Diff line number Diff line
@@ -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

scripts/ivas_conformance/runConformance.py

+2 −2
Original line number Diff line number Diff line
@@ -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/",

scripts/rend_header.txt

+2 −2
Original line number Diff line number Diff line
@@ -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