From 01b10683b82831a07976e4be01be8317c9dd5b61 Mon Sep 17 00:00:00 2001 From: "Barak A. Pearlmutter" Date: Sun, 18 Apr 2021 13:16:37 +0100 Subject: [PATCH 1/5] test robust expansion Match fish{1,2}.png instead of fish[12].png since it's an error if the file is not found. Gbp-Pq: Name 0001-test-robust-expansion.patch --- test/run_tests.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/run_tests.bash b/test/run_tests.bash index b87f45d..d31e965 100755 --- a/test/run_tests.bash +++ b/test/run_tests.bash @@ -77,7 +77,7 @@ fi "$pdiff" --help | grep -i 'usage' rm -f diff.png -"$pdiff" --output diff.png --verbose fish[12].png 2>&1 | grep -q 'FAIL' +"$pdiff" --output diff.png --verbose fish{1,2}.png 2>&1 | grep -q 'FAIL' ls diff.png rm -f diff.png @@ -86,10 +86,10 @@ head fish1.png > fake.png rm -f fake.png mkdir -p unwritable.png -"$pdiff" --output unwritable.png --verbose fish[12].png 2>&1 | grep -q 'Failed to save' +"$pdiff" --output unwritable.png --verbose fish{1,2}.png 2>&1 | grep -q 'Failed to save' rmdir unwritable.png -"$pdiff" fish[12].png --output foo 2>&1 | grep -q 'unknown filetype' +"$pdiff" fish{1,2}.png --output foo 2>&1 | grep -q 'unknown filetype' "$pdiff" --verbose fish1.png 2>&1 | grep -q 'Not enough' "$pdiff" --down-sample -3 fish1.png Aqsis_vase.png 2>&1 | grep -q 'Invalid' "$pdiff" --threshold -3 fish1.png Aqsis_vase.png 2>&1 | grep -q 'Invalid' @@ -97,7 +97,7 @@ rmdir unwritable.png "$pdiff" --verbose --scale fish1.png Aqsis_vase.png 2>&1 | grep -q 'FAIL' "$pdiff" --down-sample 2 fish1.png Aqsis_vase.png 2>&1 | grep -q 'FAIL' "$pdiff" /dev/null /dev/null 2>&1 | grep -q 'Unknown filetype' -"$pdiff" --verbose --sum-errors fish[12].png 2>&1 | grep -q 'sum' +"$pdiff" --verbose --sum-errors fish{1,2}.png 2>&1 | grep -q 'sum' "$pdiff" --color-factor .5 -threshold 1000 --gamma 3 --luminance 90 cam_mb_ref.tif cam_mb.tif "$pdiff" --verbose -down-sample 30 -scale --luminance-only --fov 80 cam_mb_ref.tif cam_mb.tif "$pdiff" --fov wrong fish1.png fish1.png 2>&1 | grep -q 'Invalid argument' From 7b63bea0be5fdbcd8c3a858ae89f582261063504 Mon Sep 17 00:00:00 2001 From: "Barak A. Pearlmutter" Date: Sun, 18 Apr 2021 11:04:50 +0100 Subject: [PATCH 2/5] test arg pdiff Optionally pass executable to test to test/run_tests.bash in $pdiff Gbp-Pq: Name 0002-test-executable.patch --- test/run_tests.bash | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/run_tests.bash b/test/run_tests.bash index d31e965..aec2d3e 100755 --- a/test/run_tests.bash +++ b/test/run_tests.bash @@ -28,6 +28,7 @@ EOF readonly script_directory=$(dirname "$0") cd "$script_directory" +if [ -z "${pdiff:=}" ]; then found=0 for d in ../build .. ../obj*; do pdiff="$d/perceptualdiff" @@ -40,9 +41,9 @@ done if [ $found = 0 ]; then echo 'perceptualdiff must be built and exist in the repository root or the "build" directory' exit 1 -else - echo "*** testing executable binary $pdiff" fi +fi +echo "*** testing executable binary $pdiff" #------------------------------------------------------------------------------ From 252e7f318996b15ce5776372094f6c8bacb9478d Mon Sep 17 00:00:00 2001 From: "Barak A. Pearlmutter" Date: Sun, 18 Apr 2021 11:12:50 +0100 Subject: [PATCH 3/5] test arg script_directory Optionally pass ${script_directory} where test data files live. Gbp-Pq: Name 0003-test-script_directory.patch --- test/run_tests.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/run_tests.bash b/test/run_tests.bash index aec2d3e..6fb6956 100755 --- a/test/run_tests.bash +++ b/test/run_tests.bash @@ -25,7 +25,7 @@ EOF } # Change to test directory -readonly script_directory=$(dirname "$0") +echo "*** script_directory: ${script_directory:=$(dirname "$0")}" cd "$script_directory" if [ -z "${pdiff:=}" ]; then From 7b04cdf36c2be825cdc7c55a556314e0514a465d Mon Sep 17 00:00:00 2001 From: "Barak A. Pearlmutter" Date: Sun, 18 Apr 2021 11:21:53 +0100 Subject: [PATCH 4/5] test arg tmpdir Optionally pass ${tmpdir} where files are written. Gbp-Pq: Name 0004-test-tmpdir.patch --- test/run_tests.bash | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/test/run_tests.bash b/test/run_tests.bash index 6fb6956..757a164 100755 --- a/test/run_tests.bash +++ b/test/run_tests.bash @@ -24,6 +24,8 @@ FAIL alpha1.png alpha2.png EOF } +echo "*** tmpdir: ${tmpdir:=/tmp}" + # Change to test directory echo "*** script_directory: ${script_directory:=$(dirname "$0")}" cd "$script_directory" @@ -78,19 +80,19 @@ fi "$pdiff" --help | grep -i 'usage' rm -f diff.png -"$pdiff" --output diff.png --verbose fish{1,2}.png 2>&1 | grep -q 'FAIL' -ls diff.png -rm -f diff.png +"$pdiff" --output ${tmpdir}/diff.png --verbose fish{1,2}.png 2>&1 | grep -q 'FAIL' +ls ${tmpdir}/diff.png +rm -f ${tmpdir}/diff.png -head fish1.png > fake.png -"$pdiff" --verbose fish1.png fake.png 2>&1 | grep -q 'Failed to load' -rm -f fake.png +head fish1.png > ${tmpdir}/fake.png +"$pdiff" --verbose fish1.png ${tmpdir}/fake.png 2>&1 | grep -q 'Failed to load' +rm -f ${tmpdir}/fake.png -mkdir -p unwritable.png -"$pdiff" --output unwritable.png --verbose fish{1,2}.png 2>&1 | grep -q 'Failed to save' -rmdir unwritable.png +mkdir -p ${tmpdir}/unwritable.png +"$pdiff" --output ${tmpdir}/unwritable.png --verbose fish{1,2}.png 2>&1 | grep -q 'Failed to save' +rmdir ${tmpdir}/unwritable.png -"$pdiff" fish{1,2}.png --output foo 2>&1 | grep -q 'unknown filetype' +"$pdiff" fish{1,2}.png --output ${tmpdir}/foo 2>&1 | grep -q 'unknown filetype' "$pdiff" --verbose fish1.png 2>&1 | grep -q 'Not enough' "$pdiff" --down-sample -3 fish1.png Aqsis_vase.png 2>&1 | grep -q 'Invalid' "$pdiff" --threshold -3 fish1.png Aqsis_vase.png 2>&1 | grep -q 'Invalid' From 462a1abff71638fdfce29a1383deeae3e6df74a3 Mon Sep 17 00:00:00 2001 From: "Barak A. Pearlmutter" Date: Mon, 11 Oct 2021 17:04:25 +0100 Subject: [PATCH 5/5] tell travis to build on s390x which is failing on the debian autobuilders See https://buildd.debian.org/status/package.php?p=perceptualdiff and https://github.com/myint/perceptualdiff/issues/19 --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 016088a..b9e7370 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,12 @@ sudo: false language: cpp +arch: + - amd64 + - arm64 + - ppc64le + - s390x + compiler: - gcc