tests: Switch over to using 'gm convert' instead of 'convert'
This commit is contained in:
parent
e26ba5174c
commit
2f62356f92
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
# Test harness code for the dyesub backend (gutenprint rendering)
|
||||
#
|
||||
# Copyright (c) 2019 Solomon Peachy <pizza@shaftnet.org>
|
||||
# Copyright (c) 2019-2024 Solomon Peachy <pizza@shaftnet.org>
|
||||
#
|
||||
# The latest version of this program can be found at:
|
||||
#
|
||||
|
@ -57,7 +57,7 @@ my $kid;
|
|||
my $error = 0;
|
||||
|
||||
my $genppd_exec = "/usr/sbin/cups-genppd.5.3";
|
||||
my $convert_exec = "/usr/bin/convert";
|
||||
my $im_exec = "/usr/bin/gm";
|
||||
my $pdftoraster_exec = "/usr/lib/cups/filter/pdftoraster";
|
||||
my $rastertogutenprint_exec = "/usr/lib/cups/filter/rastertogutenprint.5.3";
|
||||
my $backend_exec = "./dyesub_backend";
|
||||
|
@ -207,7 +207,7 @@ if ($proc_count > 1 && $kid > 0) {
|
|||
}
|
||||
} else {
|
||||
# generate PDF.
|
||||
@args = ($convert_exec);
|
||||
@args = ($im_exec, "convert");
|
||||
for (my $i = 0 ; $i < $pages ; $i++) {
|
||||
push(@args, $input_image);
|
||||
}
|
||||
|
@ -219,7 +219,7 @@ if ($proc_count > 1 && $kid > 0) {
|
|||
}
|
||||
$rval = run \@args;
|
||||
if (!$rval) {
|
||||
print("***** $row[0] $row[1] $row[2] $row[3] '$row[4]' FAIL: convert: $? -- " . join(":", @args) . "\n");
|
||||
print("***** $row[0] $row[1] $row[2] $row[3] '$row[4]' FAIL: magick convert: $? -- " . join(":", @args) . "\n");
|
||||
$error++;
|
||||
next;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue