Commit 7a8432fb authored by norvell's avatar norvell
Browse files

Cleanup around TEST_SET variable. Fix for HTML tags in parse_commands.py

parent f6bab7c0

.gitlab-ci.yml

+6 −7
Original line number Diff line number Diff line
@@ -1387,12 +1387,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 tests/renderer/test_renderer.py -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files

    - python -m pytest tests/split_rendering/test_split_rendering.py -v -n auto --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

    - $TEST_SET = "tests/codec_be_on_mr_nonselection", "tests/renderer/test_renderer.py", "tests/split_rendering/test_split_rendering.py"

    - 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 tests/split_rendering/test_split_rendering.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
@@ -1481,13 +1481,12 @@ 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 tests/split_rendering/test_split_rendering.py"

    - python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files

    - python3 -m pytest tests/split_rendering/test_split_rendering.py -v -n auto --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 $TEST_SET tests/split_rendering/test_split_rendering.py -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

scripts/parse_commands.py

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ if __name__ == '__main__': 
                rend_cmd = False

                isar_post_rend_cmd = False

                for line in infile.readlines():

                    line = line.split("<br/>")[0] # Remove trailing html tags

                    if enc_cmd:

                        cmds_enc.append(line)

                        enc_cmd = False