From 071567cc0cfc64c815a27f556ee973a464c4b557 Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Thu, 27 Oct 2022 15:09:29 +0200
Subject: [PATCH 1/3] adjust ci file for longer testvectors

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27d3656175..9aed91ea75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 variables:
   TESTV_DIR: "/usr/local/testv"
+  LTV_DIR: "/usr/local/ltv"
   BUILD_OUTPUT: "build_output.txt"
   EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test"
   SANITIZER_TESTS: "CLANG1 CLANG2"
@@ -91,6 +92,11 @@ stages:
     - if [ $exit_code -eq 1 ] && [ $non_be_flag != 0 ]; then echo "Non-bitexact  cases with non-BE tag encountered"; exit $EXIT_CODE_NON_BE; fi
     - exit 0
 
+.update-ltv-repo: &update-ltv-repo
+  - cd $LTV_DIR
+  - git pull
+  - cd -
+
 # ---------------------------------------------------------------
 # Job templates
 # ---------------------------------------------------------------
@@ -513,10 +519,13 @@ codec-comparison-on-main-push:
 # ---------------------------------------------------------------
 .sanitizer-test-template:
   extends:
+    # TODO: still needed since MASA ltv vectors are not there yet
+    #       when they were added, we can add a needs-ltv-dir template
     - .test-job-linux-needs-testv-dir
   stage: test
   tags:
     - sanitizer_test_main
+  timeout: "2 hours"
   artifacts:
     name: "$CI_JOB_NAME--main--sha-$CI_COMMIT_SHORT_SHA"
     when: always
@@ -530,6 +539,7 @@ sanitizer-test-mono:
   rules:
     - if: $IS_SANITIZER_TEST_RUN
   script:
+    - *update-ltv-repo
     - python3 ci/run_scheduled_sanitizer_test.py mono mono --tests $SANITIZER_TESTS
 
 sanitizer-test-stereo:
@@ -537,8 +547,9 @@ sanitizer-test-stereo:
   rules:
     - if: $IS_SANITIZER_TEST_RUN
       when: delayed
-      start_in: 20 minutes
+      start_in: 1 hour
   script:
+    - *update-ltv-repo
     - python3 ci/run_scheduled_sanitizer_test.py stereo $OUT_FORMATS_CHANNEL_BASED --tests $SANITIZER_TESTS
 
 sanitizer-test-stereodmxevs:
@@ -546,8 +557,9 @@ sanitizer-test-stereodmxevs:
   rules:
     - if: $IS_SANITIZER_TEST_RUN
       when: delayed
-      start_in: 40 minutes
+      start_in: 2 hours
   script:
+    - *update-ltv-repo
     - python3 ci/run_scheduled_sanitizer_test.py StereoDmxEvs mono --tests $SANITIZER_TESTS
 
 sanitizer-test-ism1:
@@ -555,8 +567,9 @@ sanitizer-test-ism1:
   rules:
     - if: $IS_SANITIZER_TEST_RUN
       when: delayed
-      start_in: 1 hour
+      start_in: 3 hours
   script:
+    - *update-ltv-repo
     - python3 ci/run_scheduled_sanitizer_test.py ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
 
 sanitizer-test-ism2:
@@ -564,8 +577,9 @@ sanitizer-test-ism2:
   rules:
     - if: $IS_SANITIZER_TEST_RUN
       when: delayed
-      start_in: 1 hour 30 minutes
+      start_in: 4 hours
   script:
+    - *update-ltv-repo
     - python3 ci/run_scheduled_sanitizer_test.py ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
 
 sanitizer-test-ism3:
@@ -573,8 +587,9 @@ sanitizer-test-ism3:
   rules:
     - if: $IS_SANITIZER_TEST_RUN
       when: delayed
-      start_in: 2 hours
+      start_in: 6 hours
   script:
+    - *update-ltv-repo
     - python3 ci/run_scheduled_sanitizer_test.py ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
 
 sanitizer-test-ism4:
@@ -582,8 +597,9 @@ sanitizer-test-ism4:
   rules:
     - if: $IS_SANITIZER_TEST_RUN
       when: delayed
-      start_in: 2 hours 30 minutes
+      start_in: 8 hours
   script:
+    - *update-ltv-repo
     - python3 ci/run_scheduled_sanitizer_test.py ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
 
 sanitizer-test-mc-5_1:
@@ -591,8 +607,9 @@ sanitizer-test-mc-5_1:
   rules:
     - if: $IS_SANITIZER_TEST_RUN
       when: delayed
-      start_in: 3 hours
+      start_in: 10 hours
   script:
+    - *update-ltv-repo
     - python3 ci/run_scheduled_sanitizer_test.py 5_1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS
 
 sanitizer-test-mc-5_1_2:
@@ -600,8 +617,9 @@ sanitizer-test-mc-5_1_2:
   rules:
     - if: $IS_SANITIZER_TEST_RUN
       when: delayed
-      start_in: 4 hours
+      start_in: 12 hours
   script:
+    - *update-ltv-repo
     - python3 ci/run_scheduled_sanitizer_test.py 5_1_2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS
 
 sanitizer-test-mc-5_1_4:
@@ -609,8 +627,9 @@ sanitizer-test-mc-5_1_4:
   rules:
     - if: $IS_SANITIZER_TEST_RUN
       when: delayed
-      start_in: 5 hours
+      start_in: 14 hours
   script:
+    - *update-ltv-repo
     - python3 ci/run_scheduled_sanitizer_test.py 5_1_4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS
 
 sanitizer-test-mc-7_1:
@@ -618,8 +637,9 @@ sanitizer-test-mc-7_1:
   rules:
     - if: $IS_SANITIZER_TEST_RUN
       when: delayed
-      start_in: 6 hours
+      start_in: 16 hours
   script:
+    - *update-ltv-repo
     - python3 ci/run_scheduled_sanitizer_test.py 7_1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS
 
 sanitizer-test-mc-7_1_4:
@@ -627,8 +647,9 @@ sanitizer-test-mc-7_1_4:
   rules:
     - if: $IS_SANITIZER_TEST_RUN
       when: delayed
-      start_in: 7 hours
+      start_in: 18 hours
   script:
+    - *update-ltv-repo
     - python3 ci/run_scheduled_sanitizer_test.py 7_1_4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS
 
 sanitizer-test-masa:
@@ -636,8 +657,9 @@ sanitizer-test-masa:
   rules:
     - if: $IS_SANITIZER_TEST_RUN
       when: delayed
-      start_in: 8 hours
+      start_in: 20 hours
   script:
+    - *update-ltv-repo
     - python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
 
 sanitizer-test-sba:
@@ -645,8 +667,9 @@ sanitizer-test-sba:
   rules:
     - if: $IS_SANITIZER_TEST_RUN
       when: delayed
-      start_in: 9 hours
+      start_in: 22 hours
   script:
+    - *update-ltv-repo
     - python3 ci/run_scheduled_sanitizer_test.py SBA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS
 
 sanitizer-test-planarsba:
@@ -654,8 +677,9 @@ sanitizer-test-planarsba:
   rules:
     - if: $IS_SANITIZER_TEST_RUN
       when: delayed
-      start_in: 10 hours
+      start_in: 24 hours
   script:
+    - *update-ltv-repo
     - python3 ci/run_scheduled_sanitizer_test.py PlanarSBA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS
 
 # GCOV/LCOV coverage analysis of self_test suite
-- 
GitLab


From 43835d426b18d618f2c1208e0303908c622da387 Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Thu, 27 Oct 2022 15:12:50 +0200
Subject: [PATCH 2/3] add json config for longer test vectors in CI

---
 scripts/config/ci_linux_ltv.json | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 scripts/config/ci_linux_ltv.json

diff --git a/scripts/config/ci_linux_ltv.json b/scripts/config/ci_linux_ltv.json
new file mode 100644
index 0000000000..e20af4edfd
--- /dev/null
+++ b/scripts/config/ci_linux_ltv.json
@@ -0,0 +1,25 @@
+{
+    "afspPath": "not_needed",
+    "utilPath": "/tools",
+    "inpaths": {
+        "MONO": "/usr/local/ltv/ltv48_MONO.wav",
+        "STEREO": "/usr/local/ltv/ltv48_STEREO.wav",
+        "FOA": "/usr/local/ltv/ltv48_FOA.wav",
+        "HOA2": "/usr/local/ltv/ltv48_HOA2.wav",
+        "HOA3": "/usr/local/ltv/ltv48_HOA3.wav",
+        "SBA": "/usr/local/ltv/ltv48_HOA3.wav",
+        "MASA1TC1DIR": "/usr/local/testv/test_MASA_1dir1TC.wav",
+        "MASA1TC2DIR": "/usr/local/testv/test_MASA_2dir1TC.wav",
+        "MASA2TC1DIR": "/usr/local/testv/test_MASA_1dir2TC.wav",
+        "MASA2TC2DIR": "/usr/local/testv/test_MASA_2dir2TC.wav",
+        "5_1": "/usr/local/ltv/ltv48_MC51.wav",
+        "5_1_2": "/usr/local/ltv/ltv48_MC512.wav",
+        "5_1_4": "/usr/local/ltv/ltv48_MC514.wav",
+        "7_1": "/usr/local/ltv/ltv48_MC71.wav",
+        "7_1_4": "/usr/local/ltv/ltv48_MC714.wav",
+        "ISM1": "/usr/local/ltv/ltv48_1ISM.wav",
+        "ISM2": "/usr/local/ltv/ltv48_2ISM.wav",
+        "ISM3": "/usr/local/ltv/ltv48_3ISM.wav",
+        "ISM4": "/usr/local/ltv/ltv48_4ISM.wav"
+    }
+}
-- 
GitLab


From 317d42b65e43d2911c58f23e89c14196d83dcc44 Mon Sep 17 00:00:00 2001
From: knj <jan.kiene@iis.fraunhofer.de>
Date: Wed, 2 Nov 2022 12:03:03 +0100
Subject: [PATCH 3/3] use correct config json file

---
 ci/run_scheduled_sanitizer_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/run_scheduled_sanitizer_test.py b/ci/run_scheduled_sanitizer_test.py
index 4f3cd25c0b..3c677cea94 100644
--- a/ci/run_scheduled_sanitizer_test.py
+++ b/ci/run_scheduled_sanitizer_test.py
@@ -7,7 +7,7 @@ import pathlib
 
 
 DURATION = "120"
-CFG = "ci_linux.json"
+CFG = "ci_linux_ltv.json"
 SUPPORTED_TESTS = ["CLANG1", "CLANG2", "CLANG3", "VALGRIND"]
 EP_FILE = "ep_015.g192"
 GENPATT_CMD = f"gen-patt -tailstat -fer -g192 -gamma 0 -rate 0.15 -tol 0.001 -reset -n {int(DURATION) * 50} {EP_FILE}"
-- 
GitLab