From 5a2d2d08e20c099ea6a18fc60fc173cfdc229802 Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Fri, 22 Apr 2011 15:57:00 +0000 Subject: [PATCH] # regression test suite: fix critical bug that would cause all postprocessing flag except th first to be ignored. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@961 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- test/regression/gen_db.py | 2 +- test/regression/run.py | 2 +- test/regression/settings.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/regression/gen_db.py b/test/regression/gen_db.py index 7eaabd08c..3f1b0df06 100644 --- a/test/regression/gen_db.py +++ b/test/regression/gen_db.py @@ -87,7 +87,7 @@ def process_dir(d, outfile, file_filter): outf = os.path.join(os.getcwd(), settings.database_name, utils.hashing(fullp, pp)) - cmd = [utils.assimp_bin_path,"dump",fullp,outf,"-b","-s","-l",pp] + cmd = [utils.assimp_bin_path,"dump",fullp,outf,"-b","-s","-l"] + pp.split() outfile.write("assimp dump "+"-"*80+"\n") outfile.flush() if subprocess.call(cmd, stdout=outfile, stderr=outfile, shell=False): diff --git a/test/regression/run.py b/test/regression/run.py index 338268581..403e329ca 100644 --- a/test/regression/run.py +++ b/test/regression/run.py @@ -179,7 +179,7 @@ def process_dir(d, outfile_results, zipin, result): outfile_results.write("assimp dump "+"-"*80+"\n") outfile_results.flush() - command = [utils.assimp_bin_path,"dump",fullpath,outfile_actual,"-b","-s","-l",pppreset] + command = [utils.assimp_bin_path,"dump",fullpath,outfile_actual,"-b","-s","-l"]+pppreset.split() r = subprocess.call(command, **shellparams) if r and not failure: diff --git a/test/regression/settings.py b/test/regression/settings.py index f3634f368..5e2fca583 100644 --- a/test/regression/settings.py +++ b/test/regression/settings.py @@ -60,7 +60,7 @@ exclude_extensions = [".lws",".assbin",".assxml",".txt",".jpeg",".jpg",".png",". # The defaults are (validate-data-structure is always enabled, for # self-explanatory reasons :-): # -# '-cfull' :apply all post processing except 'og' (optimize-scenegraph) +# '-cfull' :apply all post processing except 'og' and 'ptv' (optimize-scenegraph) # '-og -om' :run optimize-scenegraph in combination with optimize-meshes. # '-vds -jiv' :join-identical-vertices alone. This is a hotspot where # floating-point inaccuracies can cause severe damage.