Commit d8058c37 authored by norvell's avatar norvell
Browse files

Fixes for using renderer_short test in ivas-conformance*

parent 374f0dc0

.gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -1302,7 +1302,7 @@ ivas-conformance: 
    - mkdir testvec

    - mkdir testvec/binauralRenderer_interface

    - mkdir testvec/testv

    - mkdir testvec/testv/renderer

    - mkdir testvec/testv/renderer_short

    - mkdir testvec/testv/split_rendering

    - mkdir testvec/bin

    - cp    -force -ErrorAction Ignore scripts/testv/* testvec/testv
@@ -1312,7 +1312,7 @@ ivas-conformance: 
    - cp -r -force -ErrorAction Ignore scripts/trajectories testvec

    - cp -r -force -ErrorAction Ignore scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface

    - cp -r -force -ErrorAction Ignore tests/ref testvec/testv/ref

    - cp -r -force -ErrorAction Ignore tests/renderer/ref testvec/testv/renderer/ref

    - cp -r -force -ErrorAction Ignore tests/renderer_short/ref testvec/testv/renderer_short/ref

    - cp -r -force -ErrorAction Ignore tests/split_rendering/ref testvec/testv/split_rendering/ref

    - cp -r -force -ErrorAction Ignore tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs

    - cp -r -force -ErrorAction Ignore tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns
@@ -1392,7 +1392,7 @@ ivas-conformance-linux: 
    - mkdir testvec

    - mkdir testvec/binauralRenderer_interface

    - mkdir testvec/testv

    - mkdir testvec/testv/renderer

    - mkdir testvec/testv/renderer_short

    - mkdir testvec/testv/split_rendering

    - mkdir testvec/bin

    - cp -r scripts/testv/* testvec/testv
@@ -1402,7 +1402,7 @@ ivas-conformance-linux: 
    - cp -r scripts/trajectories testvec

    - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface

    - cp -r tests/ref testvec/testv/ref

    - cp -r tests/renderer/ref testvec/testv/renderer/ref

    - cp -r tests/renderer_short/ref testvec/testv/renderer_short/ref

    - cp -r tests/split_rendering/ref testvec/testv/split_rendering/ref

    - cp -r tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs

    - cp -r tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns

scripts/parse_commands.py

+2 −2
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ if __name__ == '__main__': 
                    arg = path.relpath(arg).replace('\\','/')

                    arg = re.sub('IVAS_rend_ref(.exe)?', '$CUT_REND_BIN', arg)

                    arg = re.sub('scripts', TESTV_PATH, arg)

                    arg = re.sub('tests/renderer/data', TESTV_PATH + r'renderer/data/', arg)

                    arg = re.sub('tests/renderer_short/data', TESTV_PATH + r'renderer_short/data/', arg)

                    arg = re.sub('tests', CUT_PATH, arg)

                args.append(arg)

            cmd = ' '.join(args)
@@ -188,7 +188,7 @@ if __name__ == '__main__': 
                outfile.write(cmd+'\n')

            out = re.search(r"-o\s(([\S]+)(.wav|.raw|.pcm))", cmd)

            if out and "ref" in out.group(1):

                outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH + r'/renderer/ref',REF_PATH + r'/renderer/ref')+' '+out.group(1)+' >> $LOG_FILE 2>&1\n')

                outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH + r'/renderer_short/ref',REF_PATH + r'/renderer_short/ref')+' '+out.group(1)+' >> $LOG_FILE 2>&1\n')

                outfile.write('\n')            

        with open('scripts/script_footer.txt','r') as footer:

            outfile.write(footer.read())