Commit 728cd1bd authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch... 

Merge branch '1350-ci-scripts-split-rendering-test-reference-comparison-broken-for-ivas_post_rend-executable' into 'main'

Fix split rendering BE comparison tests

See merge request !2181
parents a60dd45d 033fbca5

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ renderer-smoke-test: 
    - mv IVAS_cod IVAS_cod_ref

    - mv IVAS_dec IVAS_dec_ref

    - mv IVAS_rend IVAS_rend_ref

    - mv ISAR_post_rend ISAR_post_rend_ref

    - testcase_timeout=180



# test renderer executable with cmake + asan
@@ -724,6 +725,7 @@ split-rendering-pytest-on-merge-request: 
    - mv IVAS_cod IVAS_cod_ref

    - mv IVAS_dec IVAS_dec_ref

    - mv IVAS_rend IVAS_rend_ref

    - mv ISAR_post_rend ISAR_post_rend_ref



    ### If ref_using_main is not set, checkout the source branch to use scripts and input from there

    - if [ $ref_using_main == 0 ]; then git restore lib_com/options.h; fi # Revert changes back before checking out another branch to avoid conflicts

tests/split_rendering/utils.py

+4 −4
Original line number Diff line number Diff line
@@ -270,8 +270,8 @@ def run_full_chain_split_rendering( 
        # run split renderer

        cmd = SPLIT_POST_REND_CMD[:]



        # if test_info.config.option.create_ref:

        #    cmd[0] += BIN_SUFFIX_MERGETARGET

        if test_info.config.option.create_ref:

            cmd[0] += BIN_SUFFIX_MERGETARGET

        cmd[0] += binary_suffix

        cmd[4] = str(split_bitstream)

        cmd[6] = renderer_fmt
@@ -416,8 +416,8 @@ def run_external_split_rendering( 
        # run split renderer

        cmd = SPLIT_POST_REND_CMD[:]



        # if test_info.config.option.create_ref:

        #    cmd[0] += BIN_SUFFIX_MERGETARGET

        if test_info.config.option.create_ref:

            cmd[0] += BIN_SUFFIX_MERGETARGET

        cmd[0] += binary_suffix

        cmd[4] = str(split_bitstream)

        cmd[6] = renderer_fmt