From b71f45a8a2ef3eac054ac15eaeef2da9858622af Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Mon, 22 Apr 2024 05:43:51 +0000
Subject: [PATCH 01/36] Use LTV in ivas-conformance

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2576bc96ae..80ae9512ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1366,12 +1366,12 @@ ivas-conformance:
     # Reference creation
     - python tests/create_short_testvectors.py
     - python scripts/prepare_combined_format_inputs.py
-    - python -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref --keep_files
-    - python -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
-    - python -m pytest tests/renderer/test_renderer.py --create_ref --keep_files
+    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py --param_file scripts/config/self_test_ltv.prm"
+    - python -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
+    - python -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
 
     # Output creation
-    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
+    - python -m pytest $TEST_SET -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
     - python scripts/parse_commands.py report_cmd.html Readme_IVAS.txt
     
     # Copy input data and output ref data
@@ -1443,12 +1443,12 @@ ivas-conformance-linux:
     # Reference creation
     - python3 tests/create_short_testvectors.py
     - python3 scripts/prepare_combined_format_inputs.py
-    - python3 -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref --keep_files
-    - python3 -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
-    - python3 -m pytest tests/renderer/test_renderer.py --create_ref --keep_files
+    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py --param_file scripts/config/self_test_ltv.prm"
+    - python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
+    - python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
 
     # Output creation
-    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
+    - python -m pytest $TEST_SET -v -n auto --keep_files --create_cut --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
-- 
GitLab


From a4ef997ef7a8254eb55a6759527b23a3b22b2649 Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Mon, 22 Apr 2024 05:47:12 +0000
Subject: [PATCH 02/36] Syntax for $TEST_SET variable in PowerShell

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80ae9512ff..48b7dd3778 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1366,7 +1366,7 @@ ivas-conformance:
     # Reference creation
     - python tests/create_short_testvectors.py
     - python scripts/prepare_combined_format_inputs.py
-    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py --param_file scripts/config/self_test_ltv.prm"
+    - $TEST_SET = "tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py --param_file scripts/config/self_test_ltv.prm"
     - python -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
     - python -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
 
-- 
GitLab


From 3e80da45f3e51d71a6fc48375c9458c6e0226951 Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Mon, 22 Apr 2024 06:01:13 +0000
Subject: [PATCH 03/36] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48b7dd3778..c29ba285d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1366,12 +1366,11 @@ ivas-conformance:
     # Reference creation
     - python tests/create_short_testvectors.py
     - python scripts/prepare_combined_format_inputs.py
-    - $TEST_SET = "tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py --param_file scripts/config/self_test_ltv.prm"
-    - python -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
-    - python -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
+    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py --param_file scripts/config/self_test_ltv.prm -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
+    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py --param_file scripts/config/self_test_ltv.prm -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
 
     # Output creation
-    - python -m pytest $TEST_SET -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
+    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py --param_file scripts/config/self_test_ltv.prm -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
     - python scripts/parse_commands.py report_cmd.html Readme_IVAS.txt
     
     # Copy input data and output ref data
-- 
GitLab


From 3d28484c7da8aad4e331910bfc76d6dc405363ad Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Mon, 22 Apr 2024 06:14:32 +0000
Subject: [PATCH 04/36] Add LTV_DIR for ivas-conformance-linux.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c29ba285d5..13ae900b72 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1434,6 +1434,8 @@ ivas-conformance-linux:
       - 123
   script:
     - *print-common-info
+    - *update-ltv-repo
+    - *copy-ltv-files-to-testv-dir
     - make -j
     - cp IVAS_cod IVAS_cod_ref
     - cp IVAS_dec IVAS_dec_ref
-- 
GitLab


From b56f35847ed5cea7741f35e579a297be51f00ca0 Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Mon, 22 Apr 2024 07:16:46 +0000
Subject: [PATCH 05/36] fix python->python3 in ivas-conformance-linux

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13ae900b72..0f7c5f532e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1449,7 +1449,7 @@ ivas-conformance-linux:
     - python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
 
     # Output creation
-    - python -m pytest $TEST_SET -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
+    - python3 -m pytest $TEST_SET -v -n auto --keep_files --create_cut --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
-- 
GitLab


From 3a7cbfbc476e00bb0b1fc727d973ebb4fa0081d2 Mon Sep 17 00:00:00 2001
From: janssontoftg <tomas.toftgard@ericsson.com>
Date: Tue, 23 Apr 2024 06:12:05 +0000
Subject: [PATCH 06/36] Increased timeout for ivas-conformance pipelines.

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f7c5f532e..9fed43e917 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1348,7 +1348,7 @@ ivas-conformance:
   tags:
     - ivas-windows
   stage: test
-  timeout: "60 minutes"
+  timeout: "90 minutes"
   rules:
     - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
     - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
@@ -1426,7 +1426,7 @@ ivas-conformance-linux:
   tags:
     - ivas-linux
   stage: test
-  timeout: "60 minutes"
+  timeout: "90 minutes"
   rules:
     - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance-linux'
   allow_failure:
-- 
GitLab


From 11216a4ee468ce8707cf332707d3632ad9ad050b Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Wed, 1 May 2024 08:19:44 +0200
Subject: [PATCH 07/36] Add LTV_DIR_WIN

---
 .gitlab-ci.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08d86889a2..1cd06693cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 variables:
   TESTV_DIR: "/usr/local/testv"
   LTV_DIR: "/usr/local/ltv"
+  LTV_DIR_WIN: "c:\ltv" # Typically overwritten in config.toml: environment = ["LTV_DIR_WIN=C:\local_ltv_dir"]
   BUILD_OUTPUT: "build_output.txt"
   EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test"
   EVS_BE_WIN_TEST_DIR: "C:/Users/gitlab-runner/testvec"
@@ -167,6 +168,11 @@ stages:
   - git pull
   - cd -
 
+.update-ltv-repo-win: &update-ltv-repo-win
+  - cd $LTV_DIR_WIN
+  - git pull
+  - cd -
+
 .enable-split-rendering: &enable-split-rendering
 # automatically enable #define SPLIT_REND_WITH_HEAD_ROT in options.h, handling both /**/-comment and //-comment
   - sed -i.bak -e "s/\/\*[[:space:]]*\(#define[[:space:]]*SPLIT_REND_WITH_HEAD_ROT\)[[:space:]]*\*\//\1/g" ./lib_com/options.h
@@ -189,6 +195,11 @@ stages:
     - cp "$LTV_DIR"/*.met scripts/testv/
     - cp "$LTV_DIR"/*.csv scripts/testv/
 
+.copy-ltv-files-to-testv-dir-win: &copy-ltv-files-to-testv-dir-win
+    - cp "$LTV_DIR_WIN"/*.wav scripts/testv/
+    - cp "$LTV_DIR_WIN"/*.met scripts/testv/
+    - cp "$LTV_DIR_WIN"/*.csv scripts/testv/
+
 .activate-Werror-linux: &activate-Werror-linux
   - sed -i.bak "s/^# \(CFLAGS += -Werror\)/\1/" Makefile
   - sed -i.bak "s/# \(set(CMAKE_C_FLAGS \"\${CMAKE_C_FLAGS} -Werror\")\)/\1/" CMakeLists.txt
@@ -1346,7 +1357,7 @@ test-be-to-release:
 
 ivas-conformance:
   tags:
-    - ivas-windows
+    - ericsson-windows-runner
   stage: test
   timeout: "90 minutes"
   rules:
@@ -1357,6 +1368,8 @@ ivas-conformance:
       - 123
   script:
     - *print-common-info-windows
+    - *update-ltv-repo-win
+    - *copy-ltv-files-to-testv-dir-win    
     - python .\scripts\strip_split_rendering.py
     - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug    
     - cp -force IVAS_cod.exe IVAS_cod_ref.exe
-- 
GitLab


From 003e7be16dcc032ffb08202689d0530a25f6ebcb Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Wed, 1 May 2024 06:22:29 +0000
Subject: [PATCH 08/36] Update .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1cd06693cb..5e603a44b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 variables:
   TESTV_DIR: "/usr/local/testv"
   LTV_DIR: "/usr/local/ltv"
-  LTV_DIR_WIN: "c:\ltv" # Typically overwritten in config.toml: environment = ["LTV_DIR_WIN=C:\local_ltv_dir"]
+  LTV_DIR_WIN: "c:\ltv"
   BUILD_OUTPUT: "build_output.txt"
   EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test"
   EVS_BE_WIN_TEST_DIR: "C:/Users/gitlab-runner/testvec"
-- 
GitLab


From 4e8e6de8622b2466c3f023de263b613c01bbc0ae Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Wed, 1 May 2024 06:22:54 +0000
Subject: [PATCH 09/36] Update .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e603a44b7..96b503f248 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 variables:
   TESTV_DIR: "/usr/local/testv"
   LTV_DIR: "/usr/local/ltv"
-  LTV_DIR_WIN: "c:\ltv"
+  LTV_DIR_WIN: "c:/ltv"
   BUILD_OUTPUT: "build_output.txt"
   EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test"
   EVS_BE_WIN_TEST_DIR: "C:/Users/gitlab-runner/testvec"
-- 
GitLab


From 64ed77db680ed555e9dc9510b9a7884baf9d4808 Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Wed, 1 May 2024 06:57:47 +0000
Subject: [PATCH 10/36] Update .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96b503f248..c816780b15 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 variables:
   TESTV_DIR: "/usr/local/testv"
   LTV_DIR: "/usr/local/ltv"
-  LTV_DIR_WIN: "c:/ltv"
+  LTV_DIR_WIN: "E:/IVAS/longer-testv-on-runners"
   BUILD_OUTPUT: "build_output.txt"
   EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test"
   EVS_BE_WIN_TEST_DIR: "C:/Users/gitlab-runner/testvec"
-- 
GitLab


From dfc54ddd6861b620fe75a320729d59b245619ebf Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Wed, 1 May 2024 07:06:52 +0000
Subject: [PATCH 11/36] Update .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c816780b15..fc9dd45557 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1368,7 +1368,7 @@ ivas-conformance:
       - 123
   script:
     - *print-common-info-windows
-    - *update-ltv-repo-win
+#    - *update-ltv-repo-win
     - *copy-ltv-files-to-testv-dir-win    
     - python .\scripts\strip_split_rendering.py
     - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug    
-- 
GitLab


From 09de28c90a6a23962719be09058259807dbad4c0 Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Wed, 1 May 2024 07:14:15 +0000
Subject: [PATCH 12/36] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc9dd45557..1c7b56dc98 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -196,9 +196,9 @@ stages:
     - cp "$LTV_DIR"/*.csv scripts/testv/
 
 .copy-ltv-files-to-testv-dir-win: &copy-ltv-files-to-testv-dir-win
-    - cp "$LTV_DIR_WIN"/*.wav scripts/testv/
-    - cp "$LTV_DIR_WIN"/*.met scripts/testv/
-    - cp "$LTV_DIR_WIN"/*.csv scripts/testv/
+    - cp $LTV_DIR_WIN\*.wav scripts\testv
+    - cp $LTV_DIR_WIN\*.met scripts\testv
+    - cp $LTV_DIR_WIN\*.csv scripts\testv
 
 .activate-Werror-linux: &activate-Werror-linux
   - sed -i.bak "s/^# \(CFLAGS += -Werror\)/\1/" Makefile
-- 
GitLab


From 0566536cbae47893969e3967180661e8e420b5c4 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 2 May 2024 11:03:37 +0200
Subject: [PATCH 13/36] Re-enable update of LTV

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c7b56dc98..a80b68c25e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 variables:
   TESTV_DIR: "/usr/local/testv"
   LTV_DIR: "/usr/local/ltv"
-  LTV_DIR_WIN: "E:/IVAS/longer-testv-on-runners"
+  LTV_DIR_WIN: "C:/longer-testv-on-runners"
   BUILD_OUTPUT: "build_output.txt"
   EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test"
   EVS_BE_WIN_TEST_DIR: "C:/Users/gitlab-runner/testvec"
@@ -1368,7 +1368,7 @@ ivas-conformance:
       - 123
   script:
     - *print-common-info-windows
-#    - *update-ltv-repo-win
+    - *update-ltv-repo-win
     - *copy-ltv-files-to-testv-dir-win    
     - python .\scripts\strip_split_rendering.py
     - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug    
-- 
GitLab


From d09f501a5f020fba82bb05f68f89d74ca1352933 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 2 May 2024 11:12:25 +0200
Subject: [PATCH 14/36] Remove LTV_DIR_WIN from .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a80b68c25e..f25b481dbd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
 variables:
   TESTV_DIR: "/usr/local/testv"
   LTV_DIR: "/usr/local/ltv"
-  LTV_DIR_WIN: "C:/longer-testv-on-runners"
   BUILD_OUTPUT: "build_output.txt"
   EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test"
   EVS_BE_WIN_TEST_DIR: "C:/Users/gitlab-runner/testvec"
-- 
GitLab


From ccb9ca6b43f5f65f6001ba6ec2c2c01db184184a Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 2 May 2024 11:19:20 +0200
Subject: [PATCH 15/36] Change cd command in update-ltv-repo-win

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f25b481dbd..feb05bc370 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -168,9 +168,10 @@ stages:
   - cd -
 
 .update-ltv-repo-win: &update-ltv-repo-win
+  - Push-Location
   - cd $LTV_DIR_WIN
   - git pull
-  - cd -
+  - Pop-Location
 
 .enable-split-rendering: &enable-split-rendering
 # automatically enable #define SPLIT_REND_WITH_HEAD_ROT in options.h, handling both /**/-comment and //-comment
-- 
GitLab


From 335eba1addbc9267de581a84339b2358a2308199 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 2 May 2024 15:50:13 +0200
Subject: [PATCH 16/36] Adding cleanup script to only keep files that are used
 in 26.252

---
 scripts/cleanup_26252.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 scripts/cleanup_26252.py

diff --git a/scripts/cleanup_26252.py b/scripts/cleanup_26252.py
new file mode 100644
index 0000000000..3ebd613b31
--- /dev/null
+++ b/scripts/cleanup_26252.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+
+from pathlib import Path
+import os
+
+files = ['Readme_IVAS_JBM_dec.txt','Readme_IVAS_dec.txt','Readme_IVAS_enc.txt','Readme_IVAS_rend.txt'];
+
+used_files = []
+kept = 0
+removed = 0
+
+for file in files:
+    with open(file,"r") as fp:
+        for line in fp:
+            for item in line.split():
+                if "$TESTV_PATH" in item or "$REF_PATH" in item:
+                    used_files.append(Path(item).name)
+                    
+print(f"Identified {len(used_files)} files from scripts")
+
+for dirpath, subdirs, files in os.walk("testvec"):
+    for file in files:
+        if file in used_files:
+            kept = kept + 1
+        else:
+            removed = removed + 1
+            os.remove(os.path.join(dirpath, file))
+print(f"Removed {removed} files")
+print(f"Kept {kept} files")
\ No newline at end of file
-- 
GitLab


From 9de63b57dd10f9304de7779363e2a9dc8550bf60 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 2 May 2024 15:52:29 +0200
Subject: [PATCH 17/36] Add use of scripts/cleanup_26252.py

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index feb05bc370..e8fd7477b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1414,6 +1414,9 @@ ivas-conformance:
     - cp IVAS_dec.exe testvec/bin
     - cp IVAS_rend.exe testvec/bin
     
+    # Remove redundant files 
+    - python scripts/cleanup_26252.py
+    
     # Test run generated scripts in testvec
     - cd testvec    
     - python -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html
-- 
GitLab


From cbe0ccb9d82457d6b72e8fe7e4ed34a3c4d65fae Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 2 May 2024 16:02:44 +0200
Subject: [PATCH 18/36] Remove duplicates from file cleanup script

---
 scripts/cleanup_26252.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/cleanup_26252.py b/scripts/cleanup_26252.py
index 3ebd613b31..0efb96d4d1 100644
--- a/scripts/cleanup_26252.py
+++ b/scripts/cleanup_26252.py
@@ -13,7 +13,7 @@ for file in files:
     with open(file,"r") as fp:
         for line in fp:
             for item in line.split():
-                if "$TESTV_PATH" in item or "$REF_PATH" in item:
+                if "$TESTV_PATH" in item or "$REF_PATH" in item and Path(item).name not in used_files:
                     used_files.append(Path(item).name)
                     
 print(f"Identified {len(used_files)} files from scripts")
-- 
GitLab


From 71b766a7e5713e54ec95cf59a0de2452cafc082e Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 2 May 2024 16:16:33 +0200
Subject: [PATCH 19/36] Fix in scripts/cleanup_26252.py

---
 scripts/cleanup_26252.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/cleanup_26252.py b/scripts/cleanup_26252.py
index 0efb96d4d1..554634869c 100644
--- a/scripts/cleanup_26252.py
+++ b/scripts/cleanup_26252.py
@@ -13,10 +13,11 @@ for file in files:
     with open(file,"r") as fp:
         for line in fp:
             for item in line.split():
-                if "$TESTV_PATH" in item or "$REF_PATH" in item and Path(item).name not in used_files:
+                if "$TESTV_PATH" in item or "$REF_PATH" in item:
                     used_files.append(Path(item).name)
                     
-print(f"Identified {len(used_files)} files from scripts")
+# Remove duplicates
+used_files = list(dict.fromkeys(used_files))
 
 for dirpath, subdirs, files in os.walk("testvec"):
     for file in files:
@@ -25,5 +26,8 @@ for dirpath, subdirs, files in os.walk("testvec"):
         else:
             removed = removed + 1
             os.remove(os.path.join(dirpath, file))
+print(f"Identified {len(used_files)} files from scripts")            
 print(f"Removed {removed} files")
-print(f"Kept {kept} files")
\ No newline at end of file
+print(f"Kept {kept} files")
+
+
-- 
GitLab


From 624f371fa2edbff65d92c7165e894c2c905fa3bc Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 2 May 2024 16:24:11 +0200
Subject: [PATCH 20/36] Add coverage analysis to Linux conformance job

---
 .gitlab-ci.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8fd7477b9..0b3091ff52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1488,16 +1488,29 @@ ivas-conformance-linux:
     - cp Readme_IVAS_enc.txt testvec 
     - cp Readme_IVAS_rend.txt testvec
     - cp Readme_IVAS_JBM_dec.txt testvec
+    
+    # Create GCOV execs for converage analysis
+    - make clean
+    - make GCOV=1 -j
+    
     - cp IVAS_cod testvec/bin
     - cp IVAS_dec testvec/bin
     - cp IVAS_rend testvec/bin
     
+    # Remove redundant files 
+    - python3 scripts/cleanup_26252.py    
+    
     # Test run generated scripts in testvec
     - cd testvec    
     - python3 -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html
     - mv report.html ..
     - mv report-junit.xml ..
 
+    # Collect coverage
+    - cd -
+    - lcov -c -d obj -o coverage.info
+    - genhtml coverage.info -o coverage -t "Coverage on main @ $commit_sha"
+
   artifacts:
     name: "ivas-conformance-linux-$CI_COMMIT_SHORT_SHA"
     expire_in: 1 week
@@ -1509,6 +1522,8 @@ ivas-conformance-linux:
       - Readme_IVAS_enc.txt  
       - Readme_IVAS_rend.txt
       - Readme_IVAS_JBM_dec.txt
+      - coverage.info
+      - coverage
     expose_as: "Draft IVAS conformance -- Linux"
     reports:
       junit: report-junit.xml
-- 
GitLab


From ae795695b7cff8e74d5d847601a58cdd68bf39ac Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Thu, 2 May 2024 14:32:01 +0000
Subject: [PATCH 21/36] Run short test vector set in Linux job

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b3091ff52..b4adb2d7ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1460,7 +1460,7 @@ ivas-conformance-linux:
     # Reference creation
     - python3 tests/create_short_testvectors.py
     - python3 scripts/prepare_combined_format_inputs.py
-    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py --param_file scripts/config/self_test_ltv.prm"
+    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py"
     - python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
     - python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
 
-- 
GitLab


From f3a5fa5ea0e2ad559f7409480dd0cf1ce64d744b Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 2 May 2024 17:00:27 +0200
Subject: [PATCH 22/36] Move cleanup to keep 26.252 test scripts

---
 .gitlab-ci.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4adb2d7ba..18b507802b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1405,6 +1405,11 @@ ivas-conformance:
     - cp -r -force -ErrorAction Ignore tests/ref testvec/testv/ref
     - cp -r -force -ErrorAction Ignore tests/dut/* testvec/testv/ref
     - cp -r -force -ErrorAction Ignore tests/renderer/cut testvec/testv/renderer/ref
+    
+    # Remove redundant files 
+    - python scripts/cleanup_26252.py
+
+    # Copy test script files
     - cp -r -force -ErrorAction Ignore tests/conformance-test testvec/
     - cp Readme_IVAS_dec.txt testvec
     - cp Readme_IVAS_enc.txt testvec 
@@ -1414,8 +1419,6 @@ ivas-conformance:
     - cp IVAS_dec.exe testvec/bin
     - cp IVAS_rend.exe testvec/bin
     
-    # Remove redundant files 
-    - python scripts/cleanup_26252.py
     
     # Test run generated scripts in testvec
     - cd testvec    
@@ -1483,6 +1486,11 @@ ivas-conformance-linux:
     - cp -r tests/ref testvec/testv/ref
     - cp -r tests/dut/* testvec/testv/ref
     - cp -r tests/renderer/cut testvec/testv/renderer/ref
+    
+    # Remove redundant files 
+    - python3 scripts/cleanup_26252.py
+    
+    # Copy test script files
     - cp -r tests/conformance-test testvec/
     - cp Readme_IVAS_dec.txt testvec
     - cp Readme_IVAS_enc.txt testvec 
@@ -1496,10 +1504,7 @@ ivas-conformance-linux:
     - cp IVAS_cod testvec/bin
     - cp IVAS_dec testvec/bin
     - cp IVAS_rend testvec/bin
-    
-    # Remove redundant files 
-    - python3 scripts/cleanup_26252.py    
-    
+        
     # Test run generated scripts in testvec
     - cd testvec    
     - python3 -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html
-- 
GitLab


From 3271637ca69d729bbe9835ff60b21a96c5b3c5e9 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Thu, 2 May 2024 17:04:08 +0200
Subject: [PATCH 23/36] Restore use of LTV

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18b507802b..f9da642f40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1463,7 +1463,7 @@ ivas-conformance-linux:
     # Reference creation
     - python3 tests/create_short_testvectors.py
     - python3 scripts/prepare_combined_format_inputs.py
-    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py"
+    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py --param_file scripts/config/self_test_ltv.prm"
     - python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
     - python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
 
-- 
GitLab


From 20b63542c54dcddf4761c81fe3be3fd5d0ff5655 Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Thu, 2 May 2024 15:12:53 +0000
Subject: [PATCH 24/36] Add report_cmd.html as artifact for debugging

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18b507802b..3423671186 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1521,6 +1521,7 @@ ivas-conformance-linux:
     expire_in: 1 week
     when: always
     paths:
+      - report_cmd.html
       - report-junit.xml
       - report.html
       - Readme_IVAS_dec.txt  
-- 
GitLab


From a0fea567da9fdcf40574f43c56875aeb1025973f Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Thu, 2 May 2024 16:47:39 +0000
Subject: [PATCH 25/36] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3423671186..e637b7b5eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1379,11 +1379,11 @@ ivas-conformance:
     # Reference creation
     - python tests/create_short_testvectors.py
     - python scripts/prepare_combined_format_inputs.py
-    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py --param_file scripts/config/self_test_ltv.prm -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
-    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py --param_file scripts/config/self_test_ltv.prm -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
+    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
+    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
 
     # Output creation
-    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py --param_file scripts/config/self_test_ltv.prm -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
+    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
     - python scripts/parse_commands.py report_cmd.html Readme_IVAS.txt
     
     # Copy input data and output ref data
-- 
GitLab


From 42c660f0bdba9dd8611ed5bf6867b5729fad8b71 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 3 May 2024 07:40:29 +0200
Subject: [PATCH 26/36] Fix in cleanup_26252.py

---
 scripts/cleanup_26252.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/scripts/cleanup_26252.py b/scripts/cleanup_26252.py
index 554634869c..8c9c2ac029 100644
--- a/scripts/cleanup_26252.py
+++ b/scripts/cleanup_26252.py
@@ -2,6 +2,7 @@
 
 from pathlib import Path
 import os
+import glob
 
 files = ['Readme_IVAS_JBM_dec.txt','Readme_IVAS_dec.txt','Readme_IVAS_enc.txt','Readme_IVAS_rend.txt'];
 
@@ -9,12 +10,24 @@ used_files = []
 kept = 0
 removed = 0
 
+# Input files explicitly listed in scripts
 for file in files:
     with open(file,"r") as fp:
         for line in fp:
             for item in line.split():
                 if "$TESTV_PATH" in item or "$REF_PATH" in item:
                     used_files.append(Path(item).name)
+
+# All .dat files in testv (binary render config files listed via txt config file)
+for file in glob.glob("testvec/testv/*.dat"):
+    used_files.append(Path(item).name)    
+                    
+# All .met, .csv and .wav files in .txt configuration files
+for file in glob.glob("testvec/testv/*.txt"):
+    with open(file,"r") as fp:
+        for line in fp:        
+            if any(x in line for x in [".met",".csv",".wav"]):
+                used_files.append(Path(line).name)                    
                     
 # Remove duplicates
 used_files = list(dict.fromkeys(used_files))
-- 
GitLab


From e487ad968ce07cdd41a3bb2036057b2a350a2db6 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 3 May 2024 08:09:51 +0200
Subject: [PATCH 27/36] Fix in cleanup_26252.py - 2

---
 scripts/cleanup_26252.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/cleanup_26252.py b/scripts/cleanup_26252.py
index 8c9c2ac029..df6c88ae98 100644
--- a/scripts/cleanup_26252.py
+++ b/scripts/cleanup_26252.py
@@ -20,14 +20,14 @@ for file in files:
 
 # All .dat files in testv (binary render config files listed via txt config file)
 for file in glob.glob("testvec/testv/*.dat"):
-    used_files.append(Path(item).name)    
+    used_files.append(Path(file).name)    
                     
 # All .met, .csv and .wav files in .txt configuration files
 for file in glob.glob("testvec/testv/*.txt"):
     with open(file,"r") as fp:
         for line in fp:        
             if any(x in line for x in [".met",".csv",".wav"]):
-                used_files.append(Path(line).name)                    
+                used_files.append(Path(line).name.strip())                    
                     
 # Remove duplicates
 used_files = list(dict.fromkeys(used_files))
-- 
GitLab


From 8233c0cb6efec90bc3cfeaba49c470a68867993e Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Fri, 3 May 2024 06:20:06 +0000
Subject: [PATCH 28/36] Run only on Ericsson runner.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e637b7b5eb..e0af1595a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1443,7 +1443,7 @@ ivas-conformance:
 
 ivas-conformance-linux:
   tags:
-    - ivas-linux
+    - test-ericsson-linux-runner
   stage: test
   timeout: "90 minutes"
   rules:
-- 
GitLab


From 7f866bf67a9c2c01ad0e92ac82578b396e29453f Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Fri, 3 May 2024 06:21:18 +0000
Subject: [PATCH 29/36] Run only on Ericsson linux runner.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9da642f40..b198558f5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1443,7 +1443,7 @@ ivas-conformance:
 
 ivas-conformance-linux:
   tags:
-    - ivas-linux
+    - test-ericsson-linux-runner
   stage: test
   timeout: "90 minutes"
   rules:
-- 
GitLab


From 302a5c5b9ff9afae8801c54dda88e5b7415437bf Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 3 May 2024 08:43:28 +0200
Subject: [PATCH 30/36] Run on FhG runner to get old HTML format file

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0af1595a5..08bc41c6ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1443,7 +1443,7 @@ ivas-conformance:
 
 ivas-conformance-linux:
   tags:
-    - test-ericsson-linux-runner
+    - test-fhg-linux-runner3
   stage: test
   timeout: "90 minutes"
   rules:
@@ -1506,14 +1506,16 @@ ivas-conformance-linux:
     - cp IVAS_rend testvec/bin
         
     # Test run generated scripts in testvec
-    - cd testvec    
-    - python3 -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html
+    - cd testvec   
+    - exit_code=0    
+    - python3 -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?
     - mv report.html ..
     - mv report-junit.xml ..
 
     # Collect coverage
     - cd -
     - lcov -c -d obj -o coverage.info
+    - commit_sha=$(git rev-parse HEAD)
     - genhtml coverage.info -o coverage -t "Coverage on main @ $commit_sha"
 
   artifacts:
-- 
GitLab


From 6ff9e500fb347c11a7b7ad2742f08293f3577a90 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 3 May 2024 09:22:11 +0200
Subject: [PATCH 31/36] Fix scripts/parse_commands.py for pytest-html v3

---
 scripts/parse_commands.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/scripts/parse_commands.py b/scripts/parse_commands.py
index fe1a1840ad..6d10698cfc 100644
--- a/scripts/parse_commands.py
+++ b/scripts/parse_commands.py
@@ -38,6 +38,36 @@ if __name__ == '__main__':
                     cmds_dec.extend(re.findall(r"DUT decoder command:\\n\\t(.*?)\\n", line))
                     cmds_rend.extend(re.findall(r"Running command\\n(.*?)\\n", line))
 
+    # If pytest-html < v4 is used, the parsing will fail and render empty lists. This is a work-around in case that happens.
+    if all(not x for x in [cmds_enc, cmds_dec, cmds_rend]):
+        for html_report in input:
+            with open(html_report,'r') as infile:
+                enc_cmd = False
+                dec_cmd = False
+                rend_cmd = False
+                for line in infile.readlines():
+                    if enc_cmd:
+                        cmds_enc.append(line)
+                        enc_cmd = False
+                    elif dec_cmd:
+                        cmds_dec.append(line)
+                        dec_cmd = False
+                    elif rend_cmd:
+                        cmds_rend.append(line)
+                        rend_cmd = False
+                    else:
+                        if "DUT encoder command" in line:
+                            enc_cmd = True
+                        elif "DUT decoder command" in line:
+                            dec_cmd = True
+                        elif "Running command" in line:
+                            rend_cmd = True
+
+    # Sort lists to keep deterministic order between runs
+    cmds_enc.sort()
+    cmds_dec.sort()
+    cmds_rend.sort()
+
     with open(txt_file.replace('.','_enc.'),'w', newline='\n') as outfile:
         with open('scripts/enc_header.txt','r') as header:
             outfile.write(header.read())
-- 
GitLab


From e4f09b8a98a67316229ab5d64f3919991e4a5dcb Mon Sep 17 00:00:00 2001
From: norvell <erik.norvell@ericsson.com>
Date: Fri, 3 May 2024 08:04:41 +0000
Subject: [PATCH 32/36] Update .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08bc41c6ca..67c93fd6f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1443,7 +1443,7 @@ ivas-conformance:
 
 ivas-conformance-linux:
   tags:
-    - test-fhg-linux-runner3
+    - ivas-linux
   stage: test
   timeout: "90 minutes"
   rules:
-- 
GitLab


From 3da7e17b9d1fc0070760b452d14f6a986bd5f5f4 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 3 May 2024 10:29:36 +0200
Subject: [PATCH 33/36] Exclude apps and lib_util from coverage in conformance
 test

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 464005fd52..1b665cf52a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1515,6 +1515,8 @@ ivas-conformance-linux:
     # Collect coverage
     - cd -
     - lcov -c -d obj -o coverage.info
+    - lcov -r coverage.info "*apps*" -o coverage.info
+    - lcov -r coverage.info "*lib_util*" -o coverage.info
     - commit_sha=$(git rev-parse HEAD)
     - genhtml coverage.info -o coverage -t "Coverage on main @ $commit_sha"
 
-- 
GitLab


From bb9c3e941b2e25e7ca78b1806afe6464c7851d35 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 3 May 2024 10:41:15 +0200
Subject: [PATCH 34/36] Disable cleanup for now

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b665cf52a..a5bccac1a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1488,7 +1488,7 @@ ivas-conformance-linux:
     - cp -r tests/renderer/cut testvec/testv/renderer/ref
     
     # Remove redundant files 
-    - python3 scripts/cleanup_26252.py
+#    - python3 scripts/cleanup_26252.py
     
     # Copy test script files
     - cp -r tests/conformance-test testvec/
-- 
GitLab


From 67b0a9d49bda894587e1fb7f5847f64b98fe514d Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 3 May 2024 10:42:49 +0200
Subject: [PATCH 35/36] Set STV for ivas-conformance-linux

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5bccac1a4..4ec2afb939 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1463,7 +1463,7 @@ ivas-conformance-linux:
     # Reference creation
     - python3 tests/create_short_testvectors.py
     - python3 scripts/prepare_combined_format_inputs.py
-    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py --param_file scripts/config/self_test_ltv.prm"
+    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py"
     - python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files
     - python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref_part2 --keep_files
 
-- 
GitLab


From 89f4c9216873e7c9a55daf9d8c0ea12428fc1260 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Mon, 6 May 2024 09:57:52 +0200
Subject: [PATCH 36/36] Cleanup of conformance for short test vector usage

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ec2afb939..36ec78acc3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1357,7 +1357,7 @@ test-be-to-release:
 
 ivas-conformance:
   tags:
-    - ericsson-windows-runner
+    - ivas-windows
   stage: test
   timeout: "90 minutes"
   rules:
@@ -1367,9 +1367,7 @@ ivas-conformance:
     exit_codes:
       - 123
   script:
-    - *print-common-info-windows
-    - *update-ltv-repo-win
-    - *copy-ltv-files-to-testv-dir-win    
+    - *print-common-info-windows    
     - python .\scripts\strip_split_rendering.py
     - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug    
     - cp -force IVAS_cod.exe IVAS_cod_ref.exe
@@ -1453,8 +1451,6 @@ ivas-conformance-linux:
       - 123
   script:
     - *print-common-info
-    - *update-ltv-repo
-    - *copy-ltv-files-to-testv-dir
     - make -j
     - cp IVAS_cod IVAS_cod_ref
     - cp IVAS_dec IVAS_dec_ref
@@ -1488,7 +1484,7 @@ ivas-conformance-linux:
     - cp -r tests/renderer/cut testvec/testv/renderer/ref
     
     # Remove redundant files 
-#    - python3 scripts/cleanup_26252.py
+    - python3 scripts/cleanup_26252.py
     
     # Copy test script files
     - cp -r tests/conformance-test testvec/
@@ -1497,7 +1493,7 @@ ivas-conformance-linux:
     - cp Readme_IVAS_rend.txt testvec
     - cp Readme_IVAS_JBM_dec.txt testvec
     
-    # Create GCOV execs for converage analysis
+    # Create GCOV execs for coverage analysis
     - make clean
     - make GCOV=1 -j
     
-- 
GitLab