Commit 7047e552 authored by norvell's avatar norvell
Browse files

Fixes for file removal on Windows

parent fec68d5c
Loading
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -34,11 +34,16 @@ Execute tests specified via a parameter file.

import os
import shutil
import stat
from pathlib import Path
import filecmp
import subprocess
import pytest

def remove_readonly(func, path, excinfo):
    os.chmod(path, stat.S_IWRITE)
    func(path)

def replace_paths(instr, testv_path, ref_path, cut_path):  
    outstr = instr
    tmp = testv_path.split('=')
@@ -99,7 +104,7 @@ for s in scripts:
            path_arg = proc.split()[-1]
            if "rm" in proc:
                if os.path.exists(path_arg):
                    shutil.rmtree(path_arg)
                    shutil.rmtree(path_arg, onerror=remove_readonly) # Needed for folder tree removal on Windows.
            if "mkdir" in proc:
                Path(path_arg).mkdir(parents=True, exist_ok=True)

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ REF_PATH="./testv"
CUT_PATH="./TMP_DEC"
LOG_FILE=Readme_IVAS_dec_log.txt

rm -rf tmp
rm -rf $CUT_PATH
mkdir -p $CUT_PATH
mkdir -p $CUT_PATH/dut/masa_test/dec_output
+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ REF_PATH="./testv"
CUT_PATH="./TMP_ENC"
LOG_FILE=Readme_IVAS_enc_log.txt

rm -rf tmp
rm -rf $CUT_PATH
mkdir -p $CUT_PATH
mkdir -p $CUT_PATH/dut/masa_test/bitstreams
+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ REF_PATH="./testv"
CUT_PATH="./TMP_JBM"
LOG_FILE=Readme_IVAS_jbm_log.txt

rm -rf tmp
rm -rf $CUT_PATH
mkdir -p $CUT_PATH
mkdir -p $CUT_PATH/dut/masa_test/dec_output
+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ REF_PATH="./testv"
CUT_PATH="./TMP_REND"
LOG_FILE=Readme_IVAS_rend_log.txt

rm -rf tmp
rm -rf $CUT_PATH
mkdir -p $CUT_PATH/renderer/cut 
mkdir -p $CUT_PATH/renderer/data