diff --git a/regression-gp.csv b/regression-gp.csv index ae46144..fafe92d 100755 --- a/regression-gp.csv +++ b/regression-gp.csv @@ -139,10 +139,34 @@ sony-updr200,sonyupdr200,0x054c,0x035f,,PageSize=w360h504-div2 sony-updr200,sonyupdr200,0x054c,0x035f,,PageSize=B7,StpLaminate=Glossy sony-updr200,sonyupdr200,0x054c,0x035f,,PageSize=B7,StpLaminate=Matte # -# mitsup95, miusu70x, dnpds40, miusu9xxx, magicard +mitsubishi-p93d,mitsup93d,0x06d3,0x0398,,PageSize=w213h284 +mitsubishi-p93d,mitsup93d,0x06d3,0x0398,,PageSize=w227h284 +mitsubishi-p93d,mitsup93d,0x06d3,0x0398,,PageSize=w284h284 +mitsubishi-p93d,mitsup93d,0x06d3,0x0398,,PageSize=w284h426 +mitsubishi-p93d,mitsup93d,0x06d3,0x0398,,PageSize=w284h1277 +mitsubishi-p93d,mitsup93d,0x06d3,0x0398,,PageSize=w284h284;MediaType=Standard +mitsubishi-p93d,mitsup93d,0x06d3,0x0398,,PageSize=w284h284;MediaType=HighDensity +mitsubishi-p93d,mitsup93d,0x06d3,0x0398,,PageSize=w284h284;MediaType=HighGlossy +mitsubishi-p93d,mitsup93d,0x06d3,0x0398,,PageSize=w284h284;StpUserComment=0123456789abcdef +mitsubishi-p93d,mitsup93d,0x06d3,0x0398,,PageSize=w284h284;StpComment=DateTime +mitsubishi-p93d,mitsup93d,0x06d3,0x0398,,PageSize=w284h284;StpComment=Date +mitsubishi-p93d,mitsup93d,0x06d3,0x0398,,PageSize=w284h284;StpComment=Settings +mitsubishi-p95d,mitsup95d,0x06d3,0x3b10,,PageSize=w213h284 +mitsubishi-p95d,mitsup95d,0x06d3,0x3b10,,PageSize=w227h284 +mitsubishi-p95d,mitsup95d,0x06d3,0x3b10,,PageSize=w284h284 +mitsubishi-p95d,mitsup95d,0x06d3,0x3b10,,PageSize=w284h426 +mitsubishi-p95d,mitsup95d,0x06d3,0x3b10,,PageSize=w284h1277 +mitsubishi-p95d,mitsup95d,0x06d3,0x3b10,,PageSize=w284h284;MediaType=Standard +mitsubishi-p95d,mitsup95d,0x06d3,0x3b10,,PageSize=w284h284;MediaType=HighDensity +mitsubishi-p95d,mitsup95d,0x06d3,0x3b10,,PageSize=w284h284;MediaType=HighGlossy +mitsubishi-p95d,mitsup95d,0x06d3,0x3b10,,PageSize=w284h284;MediaType=HighGlossyK95HG +mitsubishi-p95d,mitsup95d,0x06d3,0x3b10,,PageSize=w284h284;StpUserComment=0123456789abcdef +mitsubishi-p95d,mitsup95d,0x06d3,0x3b10,,PageSize=w284h284;StpComment=DateTime +mitsubishi-p95d,mitsup95d,0x06d3,0x3b10,,PageSize=w284h284;StpComment=Date +mitsubishi-p95d,mitsup95d,0x06d3,0x3b10,,PageSize=w284h284;StpComment=Settings # -mitsubishi-p93d,miusup93d,0x06d3,0x0398,,PageSize=w213h284 -mitsubishi-p93d,miusup93d,0x06d3,0x0398,,PageSize=w227h284 -mitsubishi-p93d,miusup93d,0x06d3,0x0398,,PageSize=w284h284 -mitsubishi-p93d,miusup93d,0x06d3,0x0398,,PageSize=w284h426 -mitsubishi-p93d,miusup93d,0x06d3,0x0398,,PageSize=w284h1277 +# mitsu9550, mitsu9550s, mitsu9600, mitsu9800, mitsu9810 +# +# mitsu70x, dnpds40, magicard +# +#magicard-tango-2e,tango2e,0x0c1f,0x1800,, diff --git a/regression-gp.pl b/regression-gp.pl index ae383ca..9113fe6 100755 --- a/regression-gp.pl +++ b/regression-gp.pl @@ -7,7 +7,7 @@ my $retval = 0; my $id = 123; my $user = "tester"; my $title = "image_test"; -my $copies = 1; +my $max_copies = 3; my $input_image = "testjobs/s3s-59.png"; $ENV{"STP_SUPPRESS_VERBOSE_MESSAGES"} = 1; @@ -57,10 +57,12 @@ while () { run ["/usr/sbin/cups-genppd.5.3", "-p", "/tmp", "-Z", $gp_name] or die("FAIL genppd $?: $row[0] $row[1] $row[2] $row[3] $row[4] $row[5]\n"); # Generate raster from $image - @args = ("/usr/lib/cups/filter/imagetoraster", $id, $user, $title, $copies, $options, $input_image); + @args = ("/usr/lib/cups/filter/imagetoraster", $id, $user, $title, 1, $options, $input_image); print join(":", @args) . "\n"; - run \@args, ">", "/tmp/${gp_name}.raster" or die ("FAIL: imagetoraster $?: $row[0] $row[1] $row[2] $row[3] $row[4] $row[5]\n"); + run \@args, ">", "/tmp/${gp_name}.raster" or die ("FAIL: imagetoraster $ +?: $row[0] $row[1] $row[2] $row[3] $row[4] $row[5]\n"); + for (my $copies = 0 ; $copies < $max_copies ; $copies++) { # Call raster2gutenprint @args = ("valgrind", "/usr/lib/cups/filter/rastertogutenprint.5.3", $id, $user, $title, $copies, $options); print join(":", @args) . "\n"; @@ -70,6 +72,7 @@ while () { @args = ("./dyesub_backend", $id, $user, $title, $copies, $options); print join(":", @args) . "\n"; run \@args, "<", "/tmp/${gp_name}.raw" or die("FAIL: backend $?: $row[0] $row[1] $row[2] $row[3] $row[4] $row[5]\n"); + } print "***** PASS\n"; } diff --git a/regression.csv b/regression.csv index ce8c12d..3adb7cb 100644 --- a/regression.csv +++ b/regression.csv @@ -93,7 +93,7 @@ hitip910,0x0d16,0x000e,shinko_s6245_8x10.raw,0x11 # # 'sonyupdr150' # -#sonyupcr10,0x054c,PID,file_fixme, ### NO USB PID +#sonyupcr10,0x054c,0x0226,file_fixme, sonyupdr150,0x054c,0x01e8,sony_updr150_4x6.raw, sonyupdr150,0x054c,0x01e8,sony_updr150_8x6.raw, sonyupdr200,0x054c,0x035f,sony_updr200_2x6.raw,