Browse Source

test: add pk3 to blacklist for regression

Kim Kulling 9 years ago
parent
commit
9105fac560
3 changed files with 5 additions and 4 deletions
  1. 2 3
      test/regression/run.py
  2. 1 1
      test/regression/settings.py
  3. 2 0
      test/regression/whitelist.csv

+ 2 - 3
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)

+ 1 - 1
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"
 ]
 
 # -------------------------------------------------------------------------------

+ 2 - 0
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
+.