Commit 93d2459a authored by norvell's avatar norvell
Browse files

Merge branch 'ci/ivas-conformance-stv' into ci/ivas-conformance-ltv

parents 3271637c e487ad96

.gitlab-ci.yml

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

scripts/cleanup_26252.py

+13 −0
Original line number Diff line number Diff line
@@ -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,6 +10,7 @@ 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:
@@ -16,6 +18,17 @@ for file in files: 
                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(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.strip())                    

                    

# Remove duplicates

used_files = list(dict.fromkeys(used_files))