Changeset 505 for pkpgcounter/trunk/tests

Timestamp:

11/22/07 12:58:46 (17 years ago)

Author:

jerome

Message:

Improved testsuite generation tool to regenerate a testsuite if the input datas
don't match that of the existing one.

Location:

pkpgcounter/trunk/tests

Files:

• gstests.py (modified) (6 diffs)
• runtest.sh (modified) (2 diffs)

pkpgcounter/trunk/tests/gstests.py

@@ -27 +27 @@
 import os
 import glob
+import md5
 import tempfile
 
@@ -68 +69 @@
 def computeSize(filename) :    
     """Computes the size in pages of a file in the testsuite."""
-    answerfd = os.popen('pkpgcounter "%(filename)s"' % locals(), "r")
+    answerfd = os.popen('pkpgcounter "%(filename)s" 2>/dev/null' % locals(), "r")
     try :
         try :
@@ -82 +83 @@
     if not mastersize :
         raise RuntimeError, "Unable to compute the size of the testsuite's master file %(masterfilename)s" % locals()
-        
+    else :    
+        sys.stdout.write("Master file's contains %(mastersize)i pages.\n" % locals())
     passed = 0
     failed = 0
@@ -100 +102 @@
             sys.stdout.write("OK\n")
             passed += 1
-    print "Passed : %i (%.2f%%)" % (passed, 100.0 * passed / nbtests)
-    print "Failed : %i (%.2f%%)" % (failed, 100.0 * failed / nbtests)
+    sys.stdout.write("Passed : %i (%.2f%%)\n" % (passed, 100.0 * passed / nbtests))
+    sys.stdout.write("Failed : %i (%.2f%%)\n" % (failed, 100.0 * failed / nbtests))
             
 def main() :        
@@ -111 +113 @@
         sys.exit(-1)
     else :    
+        checksum = md5.new() # Ensures we'll recreate a new testsuite if input is different
         infilename = sys.argv[1]
         istemp = False
@@ -124 +127 @@
                     break
                 tmp.write(data)
+                checksum.update(data)
             tmp.flush()    
-            
-        genTestSuite(infilename, "testsuite")
+        else :    
+            checksum.update(infilename)
+        genTestSuite(infilename, "testsuite.%s" % checksum.hexdigest())
         runTests(infilename, "testsuite")
             

pkpgcounter/trunk/tests/runtest.sh

@@ -19 +19 @@
 echo -n "Generating testsuite..."
 gunzip <master.ps.gz >master2.ps
-for device in hl1240 \
-              hl1250 \
-              hl7x0 \
-              lj250 \
-              lj4dithp \
-              ljet2p \
-              ljet4pjl \
-              ljetplus \
-              laserjet \
-              ljet3 \
-              ljet4 \
-              lj5gray \
-              lj5mono \
-              pxlmono \
-              pxlcolor \
-              pdfwrite \
-              pswrite \
-              psgray \
-              psmono \
-              psrgb \
-              epson \
-              epsonc \
-              eps9mid \
-              eps9high \
-              stcolor \
-              st800 \
-              escp \
-              pcl3 \
-              cdeskjet \
-              cdj1600 \
-              cdj500 \
-              cdj550 \
-              cdj670 \
-              cdj850 \
-              cdj880 \
-              cdj890 \
-              cdj970 \
-              cdjcolor \
-              cdjmono \
-              dj505j \
-              djet500 \
-              djet500c \
-              hpdj1120c \
-              hpdj310 \
-              hpdj320 \
-              hpdj340 \
-              hpdj400 \
-              hpdj500 \
-              hpdj500c \
-              hpdj510 \
-              hpdj520 \
-              hpdj540 \
-              hpdj550c \
-              hpdj560c \
-              hpdj600 \
-              hpdj660c \
-              hpdj670c \
-              hpdj680c \
-              hpdj690c \
-              hpdj850c \
-              hpdj855c \
-              hpdj870c \
-              hpdj890c \
-              hpdjplus \
-              hpdjportable \
-              gdi \
-              tiff12nc \
-              tiff24nc \
-              tiffcrle \
-              tiffg3 \
-              tiffg32d \
-              tiffg4 \
-              tifflzw \
-              tiffpack ; do
-    if ! [ -f "testsuite.$device" ]  ; then
-        gs -dQUIET -dBATCH -dNOPAUSE -sOutputFile="testsuite.$device" -sDEVICE="$device" master2.ps ; 
-    fi ;
-    done
-    
+
+python ./gstests.py master2.ps
+
 if ! [ -f "colors.pdf" ]  ; then
    python ./runcolors.py ; 
@@ -103 +27 @@
 echo 
 
-echo -n "File master.ps should be 16 pages long, result is : "
-python ../pkpgpdls/analyzer.py master2.ps
-
-echo "Analyzing testsuite..."
-for file in testsuite.* ; do
-    echo -n "$file ===> " && python ../pkpgpdls/analyzer.py "$file" ;
-done    
-echo
-
 echo "Analyzing colors..."
-for cspace in BW RGB CMY CMYK ; do
+for cspace in BW RGB CMY CMYK GC ; do
     echo "Colorspace : $cspace" ;
-    python ../pkpgpdls/analyzer.py --colorspace $cspace colors.pdf ;
+    pkpgcounter --colorspace $cspace colors.pdf ;
     echo ;
 done