diff --git a/test/regression/db.zip b/test/regression/db.zip index fdb6e9d9e..12f4a18ba 100644 Binary files a/test/regression/db.zip and b/test/regression/db.zip differ diff --git a/test/regression/gen_db.py b/test/regression/gen_db.py index ade796e5f..ef10a298d 100644 --- a/test/regression/gen_db.py +++ b/test/regression/gen_db.py @@ -188,6 +188,7 @@ if __name__ == "__main__": stdout=subprocess.PIPE).communicate() ext_list = str(ext_list).lower().split(";") + # todo: Fix for multi dot extensions like .skeleton.xml ext_list = list(filter(lambda f: not f in settings.exclude_extensions, map(clean, ext_list))) diff --git a/test/regression/run.py b/test/regression/run.py index 01cefdb07..caa3a6bd0 100644 --- a/test/regression/run.py +++ b/test/regression/run.py @@ -172,6 +172,12 @@ def process_dir(d, outfile_results, zipin, result): #print("Didn't find "+fullpath+" (Hash is "+filehash+") in database") continue + # Ignore extensions via settings.py configured list + # todo: Fix for multi dot extensions like .skeleton.xml + ext = os.path.splitext(fullpath)[1].lower() + if ext != "" and ext in settings.exclude_extensions: + continue + print("-"*60 + "\n " + os.path.realpath(fullpath) + " pp: " + pppreset) outfile_actual = mkoutputdir_andgetpath(fullpath, filehash, "ACTUAL") diff --git a/test/regression/settings.py b/test/regression/settings.py index 5e2fca583..4f81cc66e 100644 --- a/test/regression/settings.py +++ b/test/regression/settings.py @@ -46,11 +46,16 @@ test scripts rely on this) """ import os + # ------------------------------------------------------------------------------- # List of file extensions to be excluded from the regression suite # File extensions are case insensitive # ------------------------------------------------------------------------------- -exclude_extensions = [".lws",".assbin",".assxml",".txt",".jpeg",".jpg",".png",".gif",".tga",".bmp"] +exclude_extensions = [ + ".lws", ".assbin", ".assxml", ".txt", ".md", + ".jpeg", ".jpg", ".png", ".gif", ".tga", ".bmp", + ".skeleton", ".skeleton.xml" +] # ------------------------------------------------------------------------------- # Post processing configurations to be included in the test. The @@ -93,8 +98,8 @@ database_name = "db" # List of directories to be processed. Paths are processed recursively. # ------------------------------------------------------------------------------- model_directories = [ -os.path.join("..","models"), -os.path.join("..","models-nonbsd") + os.path.join("..","models"), + os.path.join("..","models-nonbsd") ] # ------------------------------------------------------------------------------- @@ -114,5 +119,8 @@ dump_header_skip = 500 # ------------------------------------------------------------------------------- results = os.path.join("..","results") +# Create results directory if it does not exist +if not os.path.exists(results): + os.makedirs(results) # vim: ai ts=4 sts=4 et sw=4 diff --git a/test/regression/utils.py b/test/regression/utils.py index 0efebcd2b..931aacedf 100644 --- a/test/regression/utils.py +++ b/test/regression/utils.py @@ -87,20 +87,28 @@ def find_assimp_or_die(): global assimp_bin_path if os.name == "nt": + search_x86 = [ + os.path.join("..","..","bin","assimpcmd_release-dll_Win32","assimp.exe"), + os.path.join("..","..","bin","x86","assimp"), + os.path.join("..","..","bin","Release","assimp.exe") + ] if platform.machine() == "x86": - search = [os.path.join("..","..","bin","assimpcmd_release-dll_Win32","assimp.exe"), - os.path.join("..","..","bin","x86","assimp")] - + search = search_x86 else: # amd64, hopefully - search = [os.path.join("..","..","bin","assimpcmd_release-dll_x64","assimp.exe"), - os.path.join("..","..","bin","x64","assimp")] + search = [ + os.path.join("..","..","bin","assimpcmd_release-dll_x64","assimp.exe"), + os.path.join("..","..","bin","x64","assimp") + ] + # x64 platform does not guarantee a x64 build. Also look for x86 as last paths. + search += search_x86 assimp_bin_path = locate_file(search) if assimp_bin_path is None: print("Can't locate assimp_cmd binary") + print("Looked in", search) sys.exit(-5) - print("Located assimp/assimp_cmd binary at ",assimp_bin_path) + print("Located assimp/assimp_cmd binary from", assimp_bin_path) elif os.name == "posix": #search = [os.path.join("..","..","bin","gcc","assimp"), # os.path.join("/usr","local","bin",'assimp')] @@ -110,8 +118,6 @@ def find_assimp_or_die(): print("Unsupported operating system") sys.exit(-5) - - if __name__ == '__main__': find_assimp_or_die()