Commit 707906f6 authored by norvell's avatar norvell
Browse files

parse_commands.py needs to be run from project root

parent b8e34f0d

.gitlab-ci.yml

+5 −8
Original line number Diff line number Diff line
@@ -1252,10 +1252,7 @@ ivas-conformance: 


    # Output creation

    - 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

    - cd scripts

    - python parse_commands.py ../report_cmd.html Readme_IVAS.txt

    - cd ..

    

    - python scripts/parse_commands.py report_cmd.html Readme_IVAS.txt

    

    # Copy input data and output ref data

    - if (Test-Path testvec) {rm -r -force testvec}
@@ -1273,10 +1270,10 @@ ivas-conformance: 
    - cp -r -force -ErrorAction Ignore tests/dut/* testvec/testv/ref

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

    - cp -r -force -ErrorAction Ignore tests/conformance-test testvec/

    - cp scripts/Readme_IVAS_dec.txt testvec

    - cp scripts/Readme_IVAS_enc.txt testvec 

    - cp scripts/Readme_IVAS_rend.txt testvec

    - cp scripts/Readme_IVAS_JBM_dec.txt testvec

    - cp Readme_IVAS_dec.txt testvec

    - cp Readme_IVAS_enc.txt testvec 

    - cp Readme_IVAS_rend.txt testvec

    - cp Readme_IVAS_JBM_dec.txt testvec

    - cp IVAS_cod.exe testvec/bin

    - cp IVAS_dec.exe testvec/bin

    - cp IVAS_rend.exe testvec/bin

scripts/parse_commands.py

+7 −7
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ if __name__ == '__main__': 
                    cmds_rend.extend(re.findall(r"Running command\\n(.*?)\\n", line))



    with open(txt_file.replace('.','_enc.'),'w', newline='\n') as outfile:

        with open('enc_header.txt','r') as header:

        with open('scripts/enc_header.txt','r') as header:

            outfile.write(header.read())

        for cmd in cmds_enc:

            args = []
@@ -57,13 +57,13 @@ if __name__ == '__main__': 
            if bts:

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

            outfile.write('\n')

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

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

            outfile.write(footer.read())                        



    with open(txt_file.replace('.','_dec.'),'w', newline='\n') as outfile_dec, open(txt_file.replace('.','_JBM_dec.'),'w', newline='\n') as outfile_jbm:

        with open('dec_header.txt','r') as header:

        with open('scripts/dec_header.txt','r') as header:

            outfile_dec.write(header.read())

        with open('jbm_header.txt','r') as header:            

        with open('scripts/jbm_header.txt','r') as header:            

            outfile_jbm.write(header.read())

        for cmd in cmds_dec:

            absolute_out = re.search(r"\s(([\S]+)(.wav))$", cmd)
@@ -111,13 +111,13 @@ if __name__ == '__main__': 
                    diff_cmds.append('$DIFF_BIN '+output.replace(CUT_PATH + r'/dut',REF_PATH + r'/ref')+' '+output+' >> $LOG_FILE 2>&1')

                outfile.write(('; ').join(diff_cmds))

            outfile.write('\n\n')

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

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

            outfile_dec.write(footer.read())    

            footer.seek(0)

            outfile_jbm.write(footer.read())



    with open(txt_file.replace('.','_rend.'),'w', newline='\n') as outfile:

        with open('rend_header.txt','r') as header:

        with open('scripts/rend_header.txt','r') as header:

            outfile.write(header.read())

        for cmd in cmds_rend:

            args = []
@@ -148,5 +148,5 @@ if __name__ == '__main__': 
            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)+' >> $LOG_FILE 2>&1\n')

                outfile.write('\n')            

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

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

            outfile.write(footer.read())                
 No newline at end of file