Commit 3d73bd4c authored by norvell's avatar norvell
Browse files

Correct script generation

parent b30db714

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -1225,6 +1225,8 @@ ivas-conformance: 
    - exit_code=0

    - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref || exit_code=$?

    - python3 -m pytest tests/codec_be_on_mr_nonselection/ -v -n auto --update_ref 1 -m create_ref_part2 || exit_code=$?

    - python3 -m test_renderer_be_comparison.py # This run is needed for reference creation. renderer/cut/ can be ignored

    - rm -r tests/renderer/cut



    # Output creation

    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer_be_comparison.py -v -n auto --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?

parse_commands.py

+9 −23
Original line number Diff line number Diff line
@@ -46,15 +46,10 @@ if __name__ == '__main__': 
            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH)

            cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH )

                       

                        

            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/scripts/', TESTV_PATH)

            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/tests/',CUT_PATH)

            #cmd = cmd.replace('/home/ejatoma/ivas-codec/scripts', TESTV_PATH)

            #cmd = cmd.replace('/home/ejatoma/ivas-codec/tests/ref',CUT_PATH)

            outfile.write(cmd+'\n')

            bts = re.search(r"\s(([\S]+)(.bts|.192))$", cmd)

            if bts:

                outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH,REF_PATH)+' '+bts.group(1)+'\n')

                outfile.write('$DIFF_BIN '+bts.group(1).replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+bts.group(1)+'\n')

            outfile.write('\n')



    with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile:
@@ -65,17 +60,13 @@ if __name__ == '__main__': 
            root_folder = arg1[0:arg1.find("ivas-codec/")+10]

            cmd = cmd.replace(root_folder + r'/IVAS_dec', '$CUT_DEC_BIN')

            cmd = cmd.replace(r'\\', '/')

            cmd = cmd.replace(root_folder + r'/tests/', REF_PATH)

            cmd = cmd.replace(root_folder + r'/tests/dut', REF_PATH + r'ref', 1)

            cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)

                        

            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/tests/', REF_PATH, 1)

            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/tests/', CUT_PATH)            

            #cmd = cmd.replace('/home/ejatoma/ivas-codec/tests/ref', REF_PATH, 1)

            #cmd = cmd.replace('/home/ejatoma/ivas-codec/tests/ref', CUT_PATH)

            outfile.write(cmd+'\n')

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

            if out:

                outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH,REF_PATH)+' '+out.group(1)+'\n')

                outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH + r'dut',REF_PATH + r'ref')+' '+out.group(1)+'\n')

            outfile.write('\n')



    with open(txt_file.replace('.','_rend.'),'w', newline='\n') as outfile:
@@ -91,14 +82,9 @@ if __name__ == '__main__': 
            cmd = cmd.replace(root_folder + r'/scripts/', TESTV_PATH, 1)

            cmd = cmd.replace(root_folder + r'/tests/', CUT_PATH)            



  

            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/IVAS_rend_ref', '$CUT_REND_BIN')

            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/scripts/', TESTV_PATH, 1)

            #cmd = cmd.replace(r'C:/listen/ivas-codec_temp/tests/', CUT_PATH)            

            #cmd = cmd.replace('/home/ejatoma/ivas-codec/tests/ref', REF_PATH, 1)

            #cmd = cmd.replace('/home/ejatoma/ivas-codec/tests/ref', CUT_PATH)

            if "cut" in cmd:

                outfile.write(cmd+'\n')

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

            if out:

                outfile.write('$DIFF_BIN '+out.group(1).replace(CUT_PATH,REF_PATH)+' '+out.group(1)+'\n')

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

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

                outfile.write('\n')            
 No newline at end of file