From 9105fac560c5b5021d48624f60152239d0f0d64f Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 12 Apr 2016 00:02:31 +0200 Subject: [PATCH] test: add pk3 to blacklist for regression --- test/regression/run.py | 5 ++--- test/regression/settings.py | 2 +- test/regression/whitelist.csv | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/regression/run.py b/test/regression/run.py index 9e732b646..727a1f011 100755 --- a/test/regression/run.py +++ b/test/regression/run.py @@ -180,7 +180,6 @@ def prepare_output_dir(fullpath, myhash, app): outfile = os.path.join(outfile, app) return outfile - # ------------------------------------------------------------------------------- def process_dir(d, outfile_results, zipin, result ): shellparams = {'stdout':outfile_results, 'stderr':outfile_results, 'shell':False} @@ -191,10 +190,10 @@ def process_dir(d, outfile_results, zipin, result ): if os.path.isdir(fullpath) and not f[:1] == '.': process_dir(fullpath, outfile_results, zipin, result) continue - + if f in settings.files_to_ignore or os.path.splitext(f)[1] in settings.exclude_extensions: print("Ignoring " + f) - continue + return for pppreset in settings.pp_configs_to_test: filehash = utils.hashing(fullpath, pppreset) diff --git a/test/regression/settings.py b/test/regression/settings.py index db0407809..fce51d803 100644 --- a/test/regression/settings.py +++ b/test/regression/settings.py @@ -62,7 +62,7 @@ files_to_ignore = ["pond.0.ply", "Example.ogex"] exclude_extensions = [ ".assbin", ".assxml", ".txt", ".md", ".jpeg", ".jpg", ".png", ".gif", ".tga", ".bmp", - ".skeleton", ".skeleton.xml", ".license", ".mtl", ".material" + ".skeleton", ".skeleton.xml", ".license", ".mtl", ".material", ".pk3" ] # ------------------------------------------------------------------------------- diff --git a/test/regression/whitelist.csv b/test/regression/whitelist.csv index 2237268d1..4dafafbf0 100644 --- a/test/regression/whitelist.csv +++ b/test/regression/whitelist.csv @@ -29,3 +29,5 @@ ORIGINAL FILE;EXPECTED DUMP ../models-nonbsd/Ogre/OgreSDK/ninja.mesh.xml -cfull;../results/tmp/ninja.mesh.xml_2a5e7eb6/EXPECT ../models-nonbsd/PK3/SGDTT3.pk3 -ptv -gsn -cts -db;../results/tmp/SGDTT3.pk3_591f74f1/EXPECT ../models-nonbsd/PK3/SGDTT3.pk3 ;../results/tmp/SGDTT3.pk3_ad4b2ce1/EXPECT +../models-nonbsd/PK3/SGDTT3.pk3 -cfull;../results/tmp/SGDTT3.pk3_ad4b2ce1/EXPECT +. \ No newline at end of file