diff --git a/.githooks/pre-commit b/.githooks/pre-commit index 2de1bc8bef14..5f778c4739e9 100755 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -8,6 +8,7 @@ PATTERNS['src/external/rawspeed']="use --no-verify to change rawspeed"; PATTERNS['src/external/OpenCL']="use --no-verify to change OpenCL"; PATTERNS['src/external/libxcf']="use --no-verify to change libxcf"; PATTERNS['src/external/whereami']="use --no-verify to change whereami"; +PATTERNS['src/tests/integration']="use --no-verify to change integration"; # Loop over staged files and check for any specific pattern listed in # PATTERNS keys. diff --git a/.gitmodules b/.gitmodules index b4a689a5037c..4e1b522fb81a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,3 +11,6 @@ [submodule "src/external/whereami"] path = src/external/whereami url = https://github.com/gpakosz/whereami +[submodule "src/tests/integration"] + path = src/tests/integration + url = https://github.com/darktable-org/darktable-tests.git diff --git a/src/tests/integration b/src/tests/integration new file mode 160000 index 000000000000..92d7f392a7f2 --- /dev/null +++ b/src/tests/integration @@ -0,0 +1 @@ +Subproject commit 92d7f392a7f29775af1ebc8c56a6f4478f3f4837 diff --git a/src/tests/integration/0000-nop/expected.png b/src/tests/integration/0000-nop/expected.png deleted file mode 100644 index 2d5c642bc67d..000000000000 Binary files a/src/tests/integration/0000-nop/expected.png and /dev/null differ diff --git a/src/tests/integration/0000-nop/nop.xmp b/src/tests/integration/0000-nop/nop.xmp deleted file mode 100644 index 68d37998a947..000000000000 --- a/src/tests/integration/0000-nop/nop.xmp +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - pascal@obry.net - - - - - Creative Commons Paternité Partage des conditions initiales à l'identique (CC-BY-SA) - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0001-exposure/expected.png b/src/tests/integration/0001-exposure/expected.png deleted file mode 100644 index f04cf3a97127..000000000000 Binary files a/src/tests/integration/0001-exposure/expected.png and /dev/null differ diff --git a/src/tests/integration/0001-exposure/exposure.xmp b/src/tests/integration/0001-exposure/exposure.xmp deleted file mode 100644 index c80e281ed912..000000000000 --- a/src/tests/integration/0001-exposure/exposure.xmp +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - pascal@obry.net - - - - - Creative Commons Paternité Partage des conditions initiales à l'identique (CC-BY-SA) - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0002-local-contrast/expected.png b/src/tests/integration/0002-local-contrast/expected.png deleted file mode 100644 index d914b478b42a..000000000000 Binary files a/src/tests/integration/0002-local-contrast/expected.png and /dev/null differ diff --git a/src/tests/integration/0002-local-contrast/local-contrast.xmp b/src/tests/integration/0002-local-contrast/local-contrast.xmp deleted file mode 100644 index 09fbfbe13423..000000000000 --- a/src/tests/integration/0002-local-contrast/local-contrast.xmp +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - pascal@obry.net - - - - - Creative Commons Paternité Partage des conditions initiales à l'identique (CC-BY-SA) - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0003-denoise-bilateral/denoise-bilateral.xmp b/src/tests/integration/0003-denoise-bilateral/denoise-bilateral.xmp deleted file mode 100644 index b09b186f1255..000000000000 --- a/src/tests/integration/0003-denoise-bilateral/denoise-bilateral.xmp +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - pascal@obry.net - - - - - Creative Commons Paternité Partage des conditions initiales à l'identique (CC-BY-SA) - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0003-denoise-bilateral/expected.png b/src/tests/integration/0003-denoise-bilateral/expected.png deleted file mode 100644 index 53c583f176fb..000000000000 Binary files a/src/tests/integration/0003-denoise-bilateral/expected.png and /dev/null differ diff --git a/src/tests/integration/0004-masks/expected.png b/src/tests/integration/0004-masks/expected.png deleted file mode 100644 index 995e8b134737..000000000000 Binary files a/src/tests/integration/0004-masks/expected.png and /dev/null differ diff --git a/src/tests/integration/0004-masks/masks.xmp b/src/tests/integration/0004-masks/masks.xmp deleted file mode 100644 index 9c98cb3e216a..000000000000 --- a/src/tests/integration/0004-masks/masks.xmp +++ /dev/null @@ -1,300 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0005-orientation-minus-90/expected.png b/src/tests/integration/0005-orientation-minus-90/expected.png deleted file mode 100644 index 4681280a0951..000000000000 Binary files a/src/tests/integration/0005-orientation-minus-90/expected.png and /dev/null differ diff --git a/src/tests/integration/0005-orientation-minus-90/orientation-minus-90.xmp b/src/tests/integration/0005-orientation-minus-90/orientation-minus-90.xmp deleted file mode 100644 index 138de78a8892..000000000000 --- a/src/tests/integration/0005-orientation-minus-90/orientation-minus-90.xmp +++ /dev/null @@ -1,290 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0006-orientation-plus-90/expected.png b/src/tests/integration/0006-orientation-plus-90/expected.png deleted file mode 100644 index 09c2c0d8e17d..000000000000 Binary files a/src/tests/integration/0006-orientation-plus-90/expected.png and /dev/null differ diff --git a/src/tests/integration/0006-orientation-plus-90/orientation-plus-90.xmp b/src/tests/integration/0006-orientation-plus-90/orientation-plus-90.xmp deleted file mode 100644 index b0b3f7bc4b97..000000000000 --- a/src/tests/integration/0006-orientation-plus-90/orientation-plus-90.xmp +++ /dev/null @@ -1,290 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0007-orientation-180/expected.png b/src/tests/integration/0007-orientation-180/expected.png deleted file mode 100644 index d0581045ad80..000000000000 Binary files a/src/tests/integration/0007-orientation-180/expected.png and /dev/null differ diff --git a/src/tests/integration/0007-orientation-180/orientation-180.xmp b/src/tests/integration/0007-orientation-180/orientation-180.xmp deleted file mode 100644 index 63a23307d7c7..000000000000 --- a/src/tests/integration/0007-orientation-180/orientation-180.xmp +++ /dev/null @@ -1,300 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0008-flip-h/expected.png b/src/tests/integration/0008-flip-h/expected.png deleted file mode 100644 index f8cbcefe44fc..000000000000 Binary files a/src/tests/integration/0008-flip-h/expected.png and /dev/null differ diff --git a/src/tests/integration/0008-flip-h/flip-h.xmp b/src/tests/integration/0008-flip-h/flip-h.xmp deleted file mode 100644 index abdab75e6d8c..000000000000 --- a/src/tests/integration/0008-flip-h/flip-h.xmp +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0009-flip-v/expected.png b/src/tests/integration/0009-flip-v/expected.png deleted file mode 100644 index b582ee4631f2..000000000000 Binary files a/src/tests/integration/0009-flip-v/expected.png and /dev/null differ diff --git a/src/tests/integration/0009-flip-v/flip-v.xmp b/src/tests/integration/0009-flip-v/flip-v.xmp deleted file mode 100644 index ca502e7fd53a..000000000000 --- a/src/tests/integration/0009-flip-v/flip-v.xmp +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0010-flip-hv/expected.png b/src/tests/integration/0010-flip-hv/expected.png deleted file mode 100644 index 0da5a08929a8..000000000000 Binary files a/src/tests/integration/0010-flip-hv/expected.png and /dev/null differ diff --git a/src/tests/integration/0010-flip-hv/flip-hv.xmp b/src/tests/integration/0010-flip-hv/flip-hv.xmp deleted file mode 100644 index 958e33058e87..000000000000 --- a/src/tests/integration/0010-flip-hv/flip-hv.xmp +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0011-gdnd-90/expected.png b/src/tests/integration/0011-gdnd-90/expected.png deleted file mode 100644 index 1391271f639d..000000000000 Binary files a/src/tests/integration/0011-gdnd-90/expected.png and /dev/null differ diff --git a/src/tests/integration/0011-gdnd-90/gdnd-90.xmp b/src/tests/integration/0011-gdnd-90/gdnd-90.xmp deleted file mode 100644 index a4dfb9f50aa2..000000000000 --- a/src/tests/integration/0011-gdnd-90/gdnd-90.xmp +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0012-gdnd-45/expected.png b/src/tests/integration/0012-gdnd-45/expected.png deleted file mode 100644 index b79e20a8bf03..000000000000 Binary files a/src/tests/integration/0012-gdnd-45/expected.png and /dev/null differ diff --git a/src/tests/integration/0012-gdnd-45/gdnd-45.xmp b/src/tests/integration/0012-gdnd-45/gdnd-45.xmp deleted file mode 100644 index 30c82691815d..000000000000 --- a/src/tests/integration/0012-gdnd-45/gdnd-45.xmp +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0013-denoiseprofile-wavelets/denoiseprofile-wavelets.xmp b/src/tests/integration/0013-denoiseprofile-wavelets/denoiseprofile-wavelets.xmp deleted file mode 100644 index a58ea76f6598..000000000000 --- a/src/tests/integration/0013-denoiseprofile-wavelets/denoiseprofile-wavelets.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0013-denoiseprofile-wavelets/expected.png b/src/tests/integration/0013-denoiseprofile-wavelets/expected.png deleted file mode 100644 index 482d0f1d83c0..000000000000 Binary files a/src/tests/integration/0013-denoiseprofile-wavelets/expected.png and /dev/null differ diff --git a/src/tests/integration/0014-filmic-rgb/expected.png b/src/tests/integration/0014-filmic-rgb/expected.png deleted file mode 100644 index 26e4599b6c27..000000000000 Binary files a/src/tests/integration/0014-filmic-rgb/expected.png and /dev/null differ diff --git a/src/tests/integration/0014-filmic-rgb/filmic-rgb.xmp b/src/tests/integration/0014-filmic-rgb/filmic-rgb.xmp deleted file mode 100644 index e145dd6e0c76..000000000000 --- a/src/tests/integration/0014-filmic-rgb/filmic-rgb.xmp +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0015-shadhi-bilateral/expected.png b/src/tests/integration/0015-shadhi-bilateral/expected.png deleted file mode 100644 index e04ef8c67436..000000000000 Binary files a/src/tests/integration/0015-shadhi-bilateral/expected.png and /dev/null differ diff --git a/src/tests/integration/0015-shadhi-bilateral/shadhi-bilateral.xmp b/src/tests/integration/0015-shadhi-bilateral/shadhi-bilateral.xmp deleted file mode 100644 index db432a9a45db..000000000000 --- a/src/tests/integration/0015-shadhi-bilateral/shadhi-bilateral.xmp +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0016-lowpass-bilateral/expected.png b/src/tests/integration/0016-lowpass-bilateral/expected.png deleted file mode 100644 index 9385465d0f74..000000000000 Binary files a/src/tests/integration/0016-lowpass-bilateral/expected.png and /dev/null differ diff --git a/src/tests/integration/0016-lowpass-bilateral/lowpass-bilateral.xmp b/src/tests/integration/0016-lowpass-bilateral/lowpass-bilateral.xmp deleted file mode 100644 index 44701808f19a..000000000000 --- a/src/tests/integration/0016-lowpass-bilateral/lowpass-bilateral.xmp +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0017-monochrome/expected.png b/src/tests/integration/0017-monochrome/expected.png deleted file mode 100644 index 8a76290bbf70..000000000000 Binary files a/src/tests/integration/0017-monochrome/expected.png and /dev/null differ diff --git a/src/tests/integration/0017-monochrome/monochrome.xmp b/src/tests/integration/0017-monochrome/monochrome.xmp deleted file mode 100644 index a2fceb4de038..000000000000 --- a/src/tests/integration/0017-monochrome/monochrome.xmp +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0018-perspective-corr/expected.png b/src/tests/integration/0018-perspective-corr/expected.png deleted file mode 100644 index 0e4ee8a2cd6e..000000000000 Binary files a/src/tests/integration/0018-perspective-corr/expected.png and /dev/null differ diff --git a/src/tests/integration/0018-perspective-corr/perspective-corr.xmp b/src/tests/integration/0018-perspective-corr/perspective-corr.xmp deleted file mode 100644 index eb7ce8540aec..000000000000 --- a/src/tests/integration/0018-perspective-corr/perspective-corr.xmp +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0019-color-mapping/color-mapping.xmp b/src/tests/integration/0019-color-mapping/color-mapping.xmp deleted file mode 100644 index 46b7c946ff23..000000000000 --- a/src/tests/integration/0019-color-mapping/color-mapping.xmp +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0019-color-mapping/expected.png b/src/tests/integration/0019-color-mapping/expected.png deleted file mode 100644 index 2b2c0b18240b..000000000000 Binary files a/src/tests/integration/0019-color-mapping/expected.png and /dev/null differ diff --git a/src/tests/integration/0020-denoise-nlmeans/denoise-nlmeans.xmp b/src/tests/integration/0020-denoise-nlmeans/denoise-nlmeans.xmp deleted file mode 100644 index e0cbd59269fe..000000000000 --- a/src/tests/integration/0020-denoise-nlmeans/denoise-nlmeans.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0020-denoise-nlmeans/expected.png b/src/tests/integration/0020-denoise-nlmeans/expected.png deleted file mode 100644 index 8ab6d0f9b48b..000000000000 Binary files a/src/tests/integration/0020-denoise-nlmeans/expected.png and /dev/null differ diff --git a/src/tests/integration/0021-retouch-wavelets/expected.png b/src/tests/integration/0021-retouch-wavelets/expected.png deleted file mode 100644 index eb6fb0e31753..000000000000 Binary files a/src/tests/integration/0021-retouch-wavelets/expected.png and /dev/null differ diff --git a/src/tests/integration/0021-retouch-wavelets/retouch-wavelets.xmp b/src/tests/integration/0021-retouch-wavelets/retouch-wavelets.xmp deleted file mode 100644 index 3c78d35b3bda..000000000000 --- a/src/tests/integration/0021-retouch-wavelets/retouch-wavelets.xmp +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0022-color-zones/color-zones.xmp b/src/tests/integration/0022-color-zones/color-zones.xmp deleted file mode 100644 index 370920fd94da..000000000000 --- a/src/tests/integration/0022-color-zones/color-zones.xmp +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0022-color-zones/expected.png b/src/tests/integration/0022-color-zones/expected.png deleted file mode 100644 index 4fc3ca4d0e46..000000000000 Binary files a/src/tests/integration/0022-color-zones/expected.png and /dev/null differ diff --git a/src/tests/integration/0023-channelmixer/channelmixer.xmp b/src/tests/integration/0023-channelmixer/channelmixer.xmp deleted file mode 100644 index c16234f475c3..000000000000 --- a/src/tests/integration/0023-channelmixer/channelmixer.xmp +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0023-channelmixer/expected.png b/src/tests/integration/0023-channelmixer/expected.png deleted file mode 100644 index c94e9641829c..000000000000 Binary files a/src/tests/integration/0023-channelmixer/expected.png and /dev/null differ diff --git a/src/tests/integration/0024-contrast-equalizer/contrast-equalizer.xmp b/src/tests/integration/0024-contrast-equalizer/contrast-equalizer.xmp deleted file mode 100644 index ea423e08e198..000000000000 --- a/src/tests/integration/0024-contrast-equalizer/contrast-equalizer.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0024-contrast-equalizer/expected.png b/src/tests/integration/0024-contrast-equalizer/expected.png deleted file mode 100644 index c761deefdc81..000000000000 Binary files a/src/tests/integration/0024-contrast-equalizer/expected.png and /dev/null differ diff --git a/src/tests/integration/0025-exposure-guided-filter/expected.png b/src/tests/integration/0025-exposure-guided-filter/expected.png deleted file mode 100644 index fb494350f2d9..000000000000 Binary files a/src/tests/integration/0025-exposure-guided-filter/expected.png and /dev/null differ diff --git a/src/tests/integration/0025-exposure-guided-filter/exposure-guided-filter.xmp b/src/tests/integration/0025-exposure-guided-filter/exposure-guided-filter.xmp deleted file mode 100644 index a7437b5bf143..000000000000 --- a/src/tests/integration/0025-exposure-guided-filter/exposure-guided-filter.xmp +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0026-haze-removal/expected.png b/src/tests/integration/0026-haze-removal/expected.png deleted file mode 100644 index c5d24e8a309a..000000000000 Binary files a/src/tests/integration/0026-haze-removal/expected.png and /dev/null differ diff --git a/src/tests/integration/0026-haze-removal/haze-removal.xmp b/src/tests/integration/0026-haze-removal/haze-removal.xmp deleted file mode 100644 index 68cff5132e1c..000000000000 --- a/src/tests/integration/0026-haze-removal/haze-removal.xmp +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0027-denoiseprofile-nlmeans/denoiseprofile-nlmeans.xmp b/src/tests/integration/0027-denoiseprofile-nlmeans/denoiseprofile-nlmeans.xmp deleted file mode 100644 index b24c811cd088..000000000000 --- a/src/tests/integration/0027-denoiseprofile-nlmeans/denoiseprofile-nlmeans.xmp +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0027-denoiseprofile-nlmeans/expected.png b/src/tests/integration/0027-denoiseprofile-nlmeans/expected.png deleted file mode 100644 index f6f6b776ed3f..000000000000 Binary files a/src/tests/integration/0027-denoiseprofile-nlmeans/expected.png and /dev/null differ diff --git a/src/tests/integration/0028-highpass-overlay/expected.png b/src/tests/integration/0028-highpass-overlay/expected.png deleted file mode 100644 index 13462728eaeb..000000000000 Binary files a/src/tests/integration/0028-highpass-overlay/expected.png and /dev/null differ diff --git a/src/tests/integration/0028-highpass-overlay/highpass-overlay.xmp b/src/tests/integration/0028-highpass-overlay/highpass-overlay.xmp deleted file mode 100644 index 8b364333e496..000000000000 --- a/src/tests/integration/0028-highpass-overlay/highpass-overlay.xmp +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0029-color-correction/color-correction.xmp b/src/tests/integration/0029-color-correction/color-correction.xmp deleted file mode 100644 index 7b33715925b4..000000000000 --- a/src/tests/integration/0029-color-correction/color-correction.xmp +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0029-color-correction/expected.png b/src/tests/integration/0029-color-correction/expected.png deleted file mode 100644 index 88b22f33ca86..000000000000 Binary files a/src/tests/integration/0029-color-correction/expected.png and /dev/null differ diff --git a/src/tests/integration/0030-framing/expected.png b/src/tests/integration/0030-framing/expected.png deleted file mode 100644 index 2dd23fe84b6c..000000000000 Binary files a/src/tests/integration/0030-framing/expected.png and /dev/null differ diff --git a/src/tests/integration/0030-framing/framing.xmp b/src/tests/integration/0030-framing/framing.xmp deleted file mode 100644 index 8bc4920824be..000000000000 --- a/src/tests/integration/0030-framing/framing.xmp +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0031-globaltonemap-drago/expected.png b/src/tests/integration/0031-globaltonemap-drago/expected.png deleted file mode 100644 index b0a7f8a3b37e..000000000000 Binary files a/src/tests/integration/0031-globaltonemap-drago/expected.png and /dev/null differ diff --git a/src/tests/integration/0031-globaltonemap-drago/globaltonemap-drago.xmp b/src/tests/integration/0031-globaltonemap-drago/globaltonemap-drago.xmp deleted file mode 100644 index 91d989cc7009..000000000000 --- a/src/tests/integration/0031-globaltonemap-drago/globaltonemap-drago.xmp +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0032-watermark/expected.png b/src/tests/integration/0032-watermark/expected.png deleted file mode 100644 index f9223a2e20de..000000000000 Binary files a/src/tests/integration/0032-watermark/expected.png and /dev/null differ diff --git a/src/tests/integration/0032-watermark/watermark.xmp b/src/tests/integration/0032-watermark/watermark.xmp deleted file mode 100644 index f7b5b7e3209b..000000000000 --- a/src/tests/integration/0032-watermark/watermark.xmp +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0033-blending-modes-uniform/Readme.md b/src/tests/integration/0033-blending-modes-uniform/Readme.md deleted file mode 100644 index ce4f16aae7af..000000000000 --- a/src/tests/integration/0033-blending-modes-uniform/Readme.md +++ /dev/null @@ -1,9 +0,0 @@ - # Uniform blending modes tests - -This series of tests aims at showing regressions on uniform blending. - -They use blending opacities < 100% along with normal, multiply, addition and darken blending modes, for modules blended in RGB (exposure) and in Lab (color balance). - -They don't use drawn, parametric or rasterized masks. - -The expected result has been produced with a RelWithDebInfo build using GCC 10. diff --git a/src/tests/integration/0033-blending-modes-uniform/blending-modes-uniform.xmp b/src/tests/integration/0033-blending-modes-uniform/blending-modes-uniform.xmp deleted file mode 100644 index b730eb29c388..000000000000 --- a/src/tests/integration/0033-blending-modes-uniform/blending-modes-uniform.xmp +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - binary comment - - - - - diff --git a/src/tests/integration/0033-blending-modes-uniform/expected.png b/src/tests/integration/0033-blending-modes-uniform/expected.png deleted file mode 100644 index 1db0d150f80f..000000000000 Binary files a/src/tests/integration/0033-blending-modes-uniform/expected.png and /dev/null differ diff --git a/src/tests/integration/0034-blending-modes-parametric/Readme.md b/src/tests/integration/0034-blending-modes-parametric/Readme.md deleted file mode 100644 index f46dc64e476c..000000000000 --- a/src/tests/integration/0034-blending-modes-parametric/Readme.md +++ /dev/null @@ -1,9 +0,0 @@ - # Parametric blending modes tests - -This series of tests aims at showing regressions on parametric blending. - -They use parametric masks along with normal, multiply, addition and darken blending modes, for modules blended in RGB (exposure) and in Lab (color balance). - -They don't use drawn or rasterized masks. - -The expected result has been produced with a RelWithDebInfo build using GCC 10. diff --git a/src/tests/integration/0034-blending-modes-parametric/blending-modes-parametric.xmp b/src/tests/integration/0034-blending-modes-parametric/blending-modes-parametric.xmp deleted file mode 100644 index 86b08046e354..000000000000 --- a/src/tests/integration/0034-blending-modes-parametric/blending-modes-parametric.xmp +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - binary comment - - - - - diff --git a/src/tests/integration/0034-blending-modes-parametric/expected.png b/src/tests/integration/0034-blending-modes-parametric/expected.png deleted file mode 100644 index 091cee889f33..000000000000 Binary files a/src/tests/integration/0034-blending-modes-parametric/expected.png and /dev/null differ diff --git a/src/tests/integration/0035-multiple-modules/expected.png b/src/tests/integration/0035-multiple-modules/expected.png deleted file mode 100644 index 90400c08714a..000000000000 Binary files a/src/tests/integration/0035-multiple-modules/expected.png and /dev/null differ diff --git a/src/tests/integration/0035-multiple-modules/multiple-modules.xmp b/src/tests/integration/0035-multiple-modules/multiple-modules.xmp deleted file mode 100644 index 012f25cf2fed..000000000000 --- a/src/tests/integration/0035-multiple-modules/multiple-modules.xmp +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0036-liquify/expected.png b/src/tests/integration/0036-liquify/expected.png deleted file mode 100644 index 7508cbf54bf2..000000000000 Binary files a/src/tests/integration/0036-liquify/expected.png and /dev/null differ diff --git a/src/tests/integration/0036-liquify/liquify.xmp b/src/tests/integration/0036-liquify/liquify.xmp deleted file mode 100644 index 6bca5c84eda9..000000000000 --- a/src/tests/integration/0036-liquify/liquify.xmp +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0037-filmic-reconstruction/expected.png b/src/tests/integration/0037-filmic-reconstruction/expected.png deleted file mode 100644 index 18360ed87411..000000000000 Binary files a/src/tests/integration/0037-filmic-reconstruction/expected.png and /dev/null differ diff --git a/src/tests/integration/0037-filmic-reconstruction/filmic-reconstruction.xmp b/src/tests/integration/0037-filmic-reconstruction/filmic-reconstruction.xmp deleted file mode 100644 index ef253a799120..000000000000 --- a/src/tests/integration/0037-filmic-reconstruction/filmic-reconstruction.xmp +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - binary comment - - - - - diff --git a/src/tests/integration/0038-colorcontrast/colorcontrast.xmp b/src/tests/integration/0038-colorcontrast/colorcontrast.xmp deleted file mode 100644 index 620d3ff3020d..000000000000 --- a/src/tests/integration/0038-colorcontrast/colorcontrast.xmp +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0038-colorcontrast/expected.png b/src/tests/integration/0038-colorcontrast/expected.png deleted file mode 100644 index ef6812d05295..000000000000 Binary files a/src/tests/integration/0038-colorcontrast/expected.png and /dev/null differ diff --git a/src/tests/integration/0039-invert/expected.png b/src/tests/integration/0039-invert/expected.png deleted file mode 100644 index a194e2362e28..000000000000 Binary files a/src/tests/integration/0039-invert/expected.png and /dev/null differ diff --git a/src/tests/integration/0039-invert/invert.xmp b/src/tests/integration/0039-invert/invert.xmp deleted file mode 100644 index f2836ca3eb6e..000000000000 --- a/src/tests/integration/0039-invert/invert.xmp +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0040-fill-light/expected.png b/src/tests/integration/0040-fill-light/expected.png deleted file mode 100644 index 7ed16375406f..000000000000 Binary files a/src/tests/integration/0040-fill-light/expected.png and /dev/null differ diff --git a/src/tests/integration/0040-fill-light/fill-light.xmp b/src/tests/integration/0040-fill-light/fill-light.xmp deleted file mode 100644 index dd71d482aad6..000000000000 --- a/src/tests/integration/0040-fill-light/fill-light.xmp +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0041-localtonemap/expected.png b/src/tests/integration/0041-localtonemap/expected.png deleted file mode 100644 index 40439bde9169..000000000000 Binary files a/src/tests/integration/0041-localtonemap/expected.png and /dev/null differ diff --git a/src/tests/integration/0041-localtonemap/localtonemap.xmp b/src/tests/integration/0041-localtonemap/localtonemap.xmp deleted file mode 100644 index fdcf3d3384d1..000000000000 --- a/src/tests/integration/0041-localtonemap/localtonemap.xmp +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0042-zonesystem/expected.png b/src/tests/integration/0042-zonesystem/expected.png deleted file mode 100644 index 723d36da05f3..000000000000 Binary files a/src/tests/integration/0042-zonesystem/expected.png and /dev/null differ diff --git a/src/tests/integration/0042-zonesystem/zonesystem.xmp b/src/tests/integration/0042-zonesystem/zonesystem.xmp deleted file mode 100644 index 8e206812ad2b..000000000000 --- a/src/tests/integration/0042-zonesystem/zonesystem.xmp +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0043-dithering-fs/dithering-fs.xmp b/src/tests/integration/0043-dithering-fs/dithering-fs.xmp deleted file mode 100644 index 8f3919c09caa..000000000000 --- a/src/tests/integration/0043-dithering-fs/dithering-fs.xmp +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0043-dithering-fs/expected.png b/src/tests/integration/0043-dithering-fs/expected.png deleted file mode 100644 index c105b6d6129f..000000000000 Binary files a/src/tests/integration/0043-dithering-fs/expected.png and /dev/null differ diff --git a/src/tests/integration/0044-dithering-random/dithering-random.xmp b/src/tests/integration/0044-dithering-random/dithering-random.xmp deleted file mode 100644 index 0c317de492a7..000000000000 --- a/src/tests/integration/0044-dithering-random/dithering-random.xmp +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0044-dithering-random/expected.png b/src/tests/integration/0044-dithering-random/expected.png deleted file mode 100644 index 30a5760b1e61..000000000000 Binary files a/src/tests/integration/0044-dithering-random/expected.png and /dev/null differ diff --git a/src/tests/integration/0045-vignetting/expected.png b/src/tests/integration/0045-vignetting/expected.png deleted file mode 100644 index 78e40c719ed2..000000000000 Binary files a/src/tests/integration/0045-vignetting/expected.png and /dev/null differ diff --git a/src/tests/integration/0045-vignetting/vignetting.xmp b/src/tests/integration/0045-vignetting/vignetting.xmp deleted file mode 100644 index eaae4ee25b3d..000000000000 --- a/src/tests/integration/0045-vignetting/vignetting.xmp +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0046-demosaic-greens/demosaic-greens.xmp b/src/tests/integration/0046-demosaic-greens/demosaic-greens.xmp deleted file mode 100644 index b0d57cc42807..000000000000 --- a/src/tests/integration/0046-demosaic-greens/demosaic-greens.xmp +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0046-demosaic-greens/expected.png b/src/tests/integration/0046-demosaic-greens/expected.png deleted file mode 100644 index b4dea63121df..000000000000 Binary files a/src/tests/integration/0046-demosaic-greens/expected.png and /dev/null differ diff --git a/src/tests/integration/0047-demosaic-amaze/demosaic-amaze.xmp b/src/tests/integration/0047-demosaic-amaze/demosaic-amaze.xmp deleted file mode 100644 index 28aec50226d9..000000000000 --- a/src/tests/integration/0047-demosaic-amaze/demosaic-amaze.xmp +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0047-demosaic-amaze/expected.png b/src/tests/integration/0047-demosaic-amaze/expected.png deleted file mode 100644 index a00d4ca32d4b..000000000000 Binary files a/src/tests/integration/0047-demosaic-amaze/expected.png and /dev/null differ diff --git a/src/tests/integration/0048-demosaic-vng/demosaic-vng.xmp b/src/tests/integration/0048-demosaic-vng/demosaic-vng.xmp deleted file mode 100644 index db24601b8152..000000000000 --- a/src/tests/integration/0048-demosaic-vng/demosaic-vng.xmp +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0048-demosaic-vng/expected.png b/src/tests/integration/0048-demosaic-vng/expected.png deleted file mode 100644 index b4eb98542180..000000000000 Binary files a/src/tests/integration/0048-demosaic-vng/expected.png and /dev/null differ diff --git a/src/tests/integration/0049-rawdenoise/expected.png b/src/tests/integration/0049-rawdenoise/expected.png deleted file mode 100644 index a4d5f4901a44..000000000000 Binary files a/src/tests/integration/0049-rawdenoise/expected.png and /dev/null differ diff --git a/src/tests/integration/0049-rawdenoise/rawdenoise.xmp b/src/tests/integration/0049-rawdenoise/rawdenoise.xmp deleted file mode 100644 index dd5f40809d28..000000000000 --- a/src/tests/integration/0049-rawdenoise/rawdenoise.xmp +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0050-bloom/bloom.xmp b/src/tests/integration/0050-bloom/bloom.xmp deleted file mode 100644 index e66652b2add5..000000000000 --- a/src/tests/integration/0050-bloom/bloom.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0050-bloom/expected.png b/src/tests/integration/0050-bloom/expected.png deleted file mode 100644 index 0fb6b0df6e55..000000000000 Binary files a/src/tests/integration/0050-bloom/expected.png and /dev/null differ diff --git a/src/tests/integration/0051-soften/expected.png b/src/tests/integration/0051-soften/expected.png deleted file mode 100644 index 1286a9d0b761..000000000000 Binary files a/src/tests/integration/0051-soften/expected.png and /dev/null differ diff --git a/src/tests/integration/0051-soften/soften.xmp b/src/tests/integration/0051-soften/soften.xmp deleted file mode 100644 index 7f3d1d81cab5..000000000000 --- a/src/tests/integration/0051-soften/soften.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0052-color-reconstruction/color-reconstruction.xmp b/src/tests/integration/0052-color-reconstruction/color-reconstruction.xmp deleted file mode 100644 index f47669701184..000000000000 --- a/src/tests/integration/0052-color-reconstruction/color-reconstruction.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0052-color-reconstruction/expected.png b/src/tests/integration/0052-color-reconstruction/expected.png deleted file mode 100644 index bbac0e54a561..000000000000 Binary files a/src/tests/integration/0052-color-reconstruction/expected.png and /dev/null differ diff --git a/src/tests/integration/0053-levels/expected.png b/src/tests/integration/0053-levels/expected.png deleted file mode 100644 index 98bb6d4a7062..000000000000 Binary files a/src/tests/integration/0053-levels/expected.png and /dev/null differ diff --git a/src/tests/integration/0053-levels/levels.xmp b/src/tests/integration/0053-levels/levels.xmp deleted file mode 100644 index 704c9d3c27ac..000000000000 --- a/src/tests/integration/0053-levels/levels.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0054-rgblevels-linked/expected.png b/src/tests/integration/0054-rgblevels-linked/expected.png deleted file mode 100644 index 702bc890ee39..000000000000 Binary files a/src/tests/integration/0054-rgblevels-linked/expected.png and /dev/null differ diff --git a/src/tests/integration/0054-rgblevels-linked/rgblevels-linked.xmp b/src/tests/integration/0054-rgblevels-linked/rgblevels-linked.xmp deleted file mode 100644 index dba9899bef73..000000000000 --- a/src/tests/integration/0054-rgblevels-linked/rgblevels-linked.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0055-rgblevels-indep/expected.png b/src/tests/integration/0055-rgblevels-indep/expected.png deleted file mode 100644 index f670e6cbed8b..000000000000 Binary files a/src/tests/integration/0055-rgblevels-indep/expected.png and /dev/null differ diff --git a/src/tests/integration/0055-rgblevels-indep/rgblevels-indep.xmp b/src/tests/integration/0055-rgblevels-indep/rgblevels-indep.xmp deleted file mode 100644 index 8823b6cab23f..000000000000 --- a/src/tests/integration/0055-rgblevels-indep/rgblevels-indep.xmp +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0056-vibrance/expected.png b/src/tests/integration/0056-vibrance/expected.png deleted file mode 100644 index 63e681516d26..000000000000 Binary files a/src/tests/integration/0056-vibrance/expected.png and /dev/null differ diff --git a/src/tests/integration/0056-vibrance/vibrance.xmp b/src/tests/integration/0056-vibrance/vibrance.xmp deleted file mode 100644 index 976dd9fd2421..000000000000 --- a/src/tests/integration/0056-vibrance/vibrance.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0057-colorize/colorize.xmp b/src/tests/integration/0057-colorize/colorize.xmp deleted file mode 100644 index 32a2dcabbe35..000000000000 --- a/src/tests/integration/0057-colorize/colorize.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0057-colorize/expected.png b/src/tests/integration/0057-colorize/expected.png deleted file mode 100644 index 4cf66bbe3654..000000000000 Binary files a/src/tests/integration/0057-colorize/expected.png and /dev/null differ diff --git a/src/tests/integration/0058-defringe/defringe.xmp b/src/tests/integration/0058-defringe/defringe.xmp deleted file mode 100644 index e16a2335a09a..000000000000 --- a/src/tests/integration/0058-defringe/defringe.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0058-defringe/expected.png b/src/tests/integration/0058-defringe/expected.png deleted file mode 100644 index 39cc581d23de..000000000000 Binary files a/src/tests/integration/0058-defringe/expected.png and /dev/null differ diff --git a/src/tests/integration/0059-grain/expected.png b/src/tests/integration/0059-grain/expected.png deleted file mode 100644 index e9e2fe39f532..000000000000 Binary files a/src/tests/integration/0059-grain/expected.png and /dev/null differ diff --git a/src/tests/integration/0059-grain/grain.xmp b/src/tests/integration/0059-grain/grain.xmp deleted file mode 100644 index 7774d150022f..000000000000 --- a/src/tests/integration/0059-grain/grain.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0060-rgbcurve-indep/expected.png b/src/tests/integration/0060-rgbcurve-indep/expected.png deleted file mode 100644 index 5b0c9467fee7..000000000000 Binary files a/src/tests/integration/0060-rgbcurve-indep/expected.png and /dev/null differ diff --git a/src/tests/integration/0060-rgbcurve-indep/rgbcurve-indep.xmp b/src/tests/integration/0060-rgbcurve-indep/rgbcurve-indep.xmp deleted file mode 100644 index a1d636bfb0a7..000000000000 --- a/src/tests/integration/0060-rgbcurve-indep/rgbcurve-indep.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0061-lowlight/expected.png b/src/tests/integration/0061-lowlight/expected.png deleted file mode 100644 index 48f2e7e33a21..000000000000 Binary files a/src/tests/integration/0061-lowlight/expected.png and /dev/null differ diff --git a/src/tests/integration/0061-lowlight/lowlight.xmp b/src/tests/integration/0061-lowlight/lowlight.xmp deleted file mode 100644 index b8e48db9a9f4..000000000000 --- a/src/tests/integration/0061-lowlight/lowlight.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0062-splittoning/expected.png b/src/tests/integration/0062-splittoning/expected.png deleted file mode 100644 index f8390b022656..000000000000 Binary files a/src/tests/integration/0062-splittoning/expected.png and /dev/null differ diff --git a/src/tests/integration/0062-splittoning/splittoning.xmp b/src/tests/integration/0062-splittoning/splittoning.xmp deleted file mode 100644 index 64ca79392bc2..000000000000 --- a/src/tests/integration/0062-splittoning/splittoning.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0063-velvia/expected.png b/src/tests/integration/0063-velvia/expected.png deleted file mode 100644 index c919821367d9..000000000000 Binary files a/src/tests/integration/0063-velvia/expected.png and /dev/null differ diff --git a/src/tests/integration/0063-velvia/velvia.xmp b/src/tests/integration/0063-velvia/velvia.xmp deleted file mode 100644 index 475f3f0c12f8..000000000000 --- a/src/tests/integration/0063-velvia/velvia.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0064-demosaic-xtrans-vng/demosaic-xtrans-vng.xmp b/src/tests/integration/0064-demosaic-xtrans-vng/demosaic-xtrans-vng.xmp deleted file mode 100644 index 93d468ef62d5..000000000000 --- a/src/tests/integration/0064-demosaic-xtrans-vng/demosaic-xtrans-vng.xmp +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0064-demosaic-xtrans-vng/expected.png b/src/tests/integration/0064-demosaic-xtrans-vng/expected.png deleted file mode 100644 index 81c2576515eb..000000000000 Binary files a/src/tests/integration/0064-demosaic-xtrans-vng/expected.png and /dev/null differ diff --git a/src/tests/integration/0065-demosaic-mark1/demosaic-mark1.xmp b/src/tests/integration/0065-demosaic-mark1/demosaic-mark1.xmp deleted file mode 100644 index ade59b65a0b6..000000000000 --- a/src/tests/integration/0065-demosaic-mark1/demosaic-mark1.xmp +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0065-demosaic-mark1/expected.png b/src/tests/integration/0065-demosaic-mark1/expected.png deleted file mode 100644 index 080d9c754357..000000000000 Binary files a/src/tests/integration/0065-demosaic-mark1/expected.png and /dev/null differ diff --git a/src/tests/integration/0066-demosaic-mark3/demosaic-mark3.xmp b/src/tests/integration/0066-demosaic-mark3/demosaic-mark3.xmp deleted file mode 100644 index ca2b67b66eaa..000000000000 --- a/src/tests/integration/0066-demosaic-mark3/demosaic-mark3.xmp +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0066-demosaic-mark3/expected.png b/src/tests/integration/0066-demosaic-mark3/expected.png deleted file mode 100644 index f3fa6b4fe9a9..000000000000 Binary files a/src/tests/integration/0066-demosaic-mark3/expected.png and /dev/null differ diff --git a/src/tests/integration/0067-demosaic-fdc/demosaic-fdc.xmp b/src/tests/integration/0067-demosaic-fdc/demosaic-fdc.xmp deleted file mode 100644 index c5b87af6d74b..000000000000 --- a/src/tests/integration/0067-demosaic-fdc/demosaic-fdc.xmp +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0067-demosaic-fdc/expected.png b/src/tests/integration/0067-demosaic-fdc/expected.png deleted file mode 100644 index b49d905253ea..000000000000 Binary files a/src/tests/integration/0067-demosaic-fdc/expected.png and /dev/null differ diff --git a/src/tests/integration/0068-rawdenoise-xtrans/expected.png b/src/tests/integration/0068-rawdenoise-xtrans/expected.png deleted file mode 100644 index d1291722b048..000000000000 Binary files a/src/tests/integration/0068-rawdenoise-xtrans/expected.png and /dev/null differ diff --git a/src/tests/integration/0068-rawdenoise-xtrans/rawdenoise-xtrans.xmp b/src/tests/integration/0068-rawdenoise-xtrans/rawdenoise-xtrans.xmp deleted file mode 100644 index 869afc4f9af3..000000000000 --- a/src/tests/integration/0068-rawdenoise-xtrans/rawdenoise-xtrans.xmp +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - Ralf Brown - - - - - diff --git a/src/tests/integration/0069-tonecurve-rgb-linked/expected.png b/src/tests/integration/0069-tonecurve-rgb-linked/expected.png deleted file mode 100644 index 55ae24142850..000000000000 Binary files a/src/tests/integration/0069-tonecurve-rgb-linked/expected.png and /dev/null differ diff --git a/src/tests/integration/0069-tonecurve-rgb-linked/tonecurve-rgb-linked.xmp b/src/tests/integration/0069-tonecurve-rgb-linked/tonecurve-rgb-linked.xmp deleted file mode 100644 index 56ba34c28a9a..000000000000 --- a/src/tests/integration/0069-tonecurve-rgb-linked/tonecurve-rgb-linked.xmp +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0070-tonecurve-xyz-linked/expected.png b/src/tests/integration/0070-tonecurve-xyz-linked/expected.png deleted file mode 100644 index 7c716b538311..000000000000 Binary files a/src/tests/integration/0070-tonecurve-xyz-linked/expected.png and /dev/null differ diff --git a/src/tests/integration/0070-tonecurve-xyz-linked/tonecurve-xyz-linked.xmp b/src/tests/integration/0070-tonecurve-xyz-linked/tonecurve-xyz-linked.xmp deleted file mode 100644 index 055a08e3af19..000000000000 --- a/src/tests/integration/0070-tonecurve-xyz-linked/tonecurve-xyz-linked.xmp +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0071-tonecurve-lab-linked/expected.png b/src/tests/integration/0071-tonecurve-lab-linked/expected.png deleted file mode 100644 index 17fd6ad31f38..000000000000 Binary files a/src/tests/integration/0071-tonecurve-lab-linked/expected.png and /dev/null differ diff --git a/src/tests/integration/0071-tonecurve-lab-linked/tonecurve-lab-linked.xmp b/src/tests/integration/0071-tonecurve-lab-linked/tonecurve-lab-linked.xmp deleted file mode 100644 index 8c3dbc77d08a..000000000000 --- a/src/tests/integration/0071-tonecurve-lab-linked/tonecurve-lab-linked.xmp +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0072-tonecurve-lab-indep/expected.png b/src/tests/integration/0072-tonecurve-lab-indep/expected.png deleted file mode 100644 index a7b15dac511b..000000000000 Binary files a/src/tests/integration/0072-tonecurve-lab-indep/expected.png and /dev/null differ diff --git a/src/tests/integration/0072-tonecurve-lab-indep/tonecurve-lab-indep.xmp b/src/tests/integration/0072-tonecurve-lab-indep/tonecurve-lab-indep.xmp deleted file mode 100644 index 6db903815adb..000000000000 --- a/src/tests/integration/0072-tonecurve-lab-indep/tonecurve-lab-indep.xmp +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0073-spot-removal/expected.png b/src/tests/integration/0073-spot-removal/expected.png deleted file mode 100644 index 21a870aabe9d..000000000000 Binary files a/src/tests/integration/0073-spot-removal/expected.png and /dev/null differ diff --git a/src/tests/integration/0073-spot-removal/spot-removal.xmp b/src/tests/integration/0073-spot-removal/spot-removal.xmp deleted file mode 100644 index e3a454410551..000000000000 --- a/src/tests/integration/0073-spot-removal/spot-removal.xmp +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0074-retouch-clone/expected.png b/src/tests/integration/0074-retouch-clone/expected.png deleted file mode 100644 index e8d8d15f82dc..000000000000 Binary files a/src/tests/integration/0074-retouch-clone/expected.png and /dev/null differ diff --git a/src/tests/integration/0074-retouch-clone/retouch-clone.xmp b/src/tests/integration/0074-retouch-clone/retouch-clone.xmp deleted file mode 100644 index 74ade509047d..000000000000 --- a/src/tests/integration/0074-retouch-clone/retouch-clone.xmp +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0075-retouch-heal/expected.png b/src/tests/integration/0075-retouch-heal/expected.png deleted file mode 100644 index 8f40b42b303d..000000000000 Binary files a/src/tests/integration/0075-retouch-heal/expected.png and /dev/null differ diff --git a/src/tests/integration/0075-retouch-heal/retouch-heal.xmp b/src/tests/integration/0075-retouch-heal/retouch-heal.xmp deleted file mode 100644 index 5d8356dc8baf..000000000000 --- a/src/tests/integration/0075-retouch-heal/retouch-heal.xmp +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0076-retouch-blur-fill/expected.png b/src/tests/integration/0076-retouch-blur-fill/expected.png deleted file mode 100644 index 0eb7be910fd8..000000000000 Binary files a/src/tests/integration/0076-retouch-blur-fill/expected.png and /dev/null differ diff --git a/src/tests/integration/0076-retouch-blur-fill/retouch-blur-fill.xmp b/src/tests/integration/0076-retouch-blur-fill/retouch-blur-fill.xmp deleted file mode 100644 index 715593a1dec2..000000000000 --- a/src/tests/integration/0076-retouch-blur-fill/retouch-blur-fill.xmp +++ /dev/null @@ -1,387 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/integration/0077-croprotate-keystone/croprotate-keystone.xmp b/src/tests/integration/0077-croprotate-keystone/croprotate-keystone.xmp deleted file mode 100644 index 218ba7d57173..000000000000 --- a/src/tests/integration/0077-croprotate-keystone/croprotate-keystone.xmp +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - pascal@obry.net - - - - - Creative Commons Paternité Partage des conditions initiales à l'identique (CC-BY-SA) - - - - - diff --git a/src/tests/integration/0077-croprotate-keystone/expected.png b/src/tests/integration/0077-croprotate-keystone/expected.png deleted file mode 100644 index 02a2377bb3db..000000000000 Binary files a/src/tests/integration/0077-croprotate-keystone/expected.png and /dev/null differ diff --git a/src/tests/integration/0078-basecurve-fusion/basecurve-fusion.xmp b/src/tests/integration/0078-basecurve-fusion/basecurve-fusion.xmp deleted file mode 100644 index 72bb8dce3323..000000000000 --- a/src/tests/integration/0078-basecurve-fusion/basecurve-fusion.xmp +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - pascal@obry.net - - - - - Creative Commons Paternité Partage des conditions initiales à l'identique (CC-BY-SA) - - - - - diff --git a/src/tests/integration/0078-basecurve-fusion/expected.png b/src/tests/integration/0078-basecurve-fusion/expected.png deleted file mode 100644 index b6cc4817f7bf..000000000000 Binary files a/src/tests/integration/0078-basecurve-fusion/expected.png and /dev/null differ diff --git a/src/tests/integration/0079-toneequal-gf/expected.png b/src/tests/integration/0079-toneequal-gf/expected.png deleted file mode 100644 index 0c2c431ca492..000000000000 Binary files a/src/tests/integration/0079-toneequal-gf/expected.png and /dev/null differ diff --git a/src/tests/integration/0079-toneequal-gf/toneequal-gf.xmp b/src/tests/integration/0079-toneequal-gf/toneequal-gf.xmp deleted file mode 100644 index 36f53ea2ea6e..000000000000 --- a/src/tests/integration/0079-toneequal-gf/toneequal-gf.xmp +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - pascal@obry.net - - - - - Creative Commons Paternité Partage des conditions initiales à l'identique (CC-BY-SA) - - - - - diff --git a/src/tests/integration/0080-toneequal-eigf/expected.png b/src/tests/integration/0080-toneequal-eigf/expected.png deleted file mode 100644 index 7f38c538437d..000000000000 Binary files a/src/tests/integration/0080-toneequal-eigf/expected.png and /dev/null differ diff --git a/src/tests/integration/0080-toneequal-eigf/toneequal-eigf.xmp b/src/tests/integration/0080-toneequal-eigf/toneequal-eigf.xmp deleted file mode 100644 index 47afce5aaa76..000000000000 --- a/src/tests/integration/0080-toneequal-eigf/toneequal-eigf.xmp +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - pascal@obry.net - - - - - Creative Commons Paternité Partage des conditions initiales à l'identique (CC-BY-SA) - - - - - diff --git a/src/tests/integration/0081-mask-groups/expected.png b/src/tests/integration/0081-mask-groups/expected.png deleted file mode 100644 index be9cc80706b9..000000000000 Binary files a/src/tests/integration/0081-mask-groups/expected.png and /dev/null differ diff --git a/src/tests/integration/0081-mask-groups/mask-groups.xmp b/src/tests/integration/0081-mask-groups/mask-groups.xmp deleted file mode 100644 index e323fe69af6b..000000000000 --- a/src/tests/integration/0081-mask-groups/mask-groups.xmp +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - pascal@obry.net - - - - - Creative Commons Paternité Partage des conditions initiales à l'identique (CC-BY-SA) - - - - - diff --git a/src/tests/integration/README.txt b/src/tests/integration/README.txt deleted file mode 100644 index 309554648755..000000000000 --- a/src/tests/integration/README.txt +++ /dev/null @@ -1,67 +0,0 @@ - -Structure ---------- - -images/ : a directory containing test images - -run.sh : main driver - -deltae : python script to compute a delta-E between 2 images - expected.jpg and output.jpg - -nnnn-name/ : tests - -Needed tools : zopflipng - - -How to add a new test (using default driver) --------------------------------------------- - -1. Create a new directory - - - - -2. Start darktable, open one test image (or add a new one if needed) - -3. Do a dev using whatever module - -4. Copy the resulting .xmp into - - - And rename it .xmp - -5. Do a first run of the test to get the expected output - - ./run - - The output.png will be copied to expected.png, double check that - expected.png is correct and really the expected output. - -6. Test that all is ok by running: - - ./run - - All values must be 0 as there is no change in darktable, so the - expected output should be exactly the same image as the output. - - $ ./run.sh 0001-exposure - Test ./0001-exposure - image mire1.cr2 - Max dE 0.0000 - OK - -7. If all goes well commit the .xmp and expected.png files - - - -How to add a new test (using specific driver) --------------------------------------------- - -1. Create a new directory - - - - -2. Create a file named test.sh into this directory - - This test.sh is a specific driver that can do whatever is necessary - for the test. At the end the driver must return 0 if all is OK and - 1 otherwise. diff --git a/src/tests/integration/deltae b/src/tests/integration/deltae deleted file mode 100755 index e3fda6b56521..000000000000 --- a/src/tests/integration/deltae +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/python3 - -# Requires: -# python3-opencv -# python3-numpy -# python3-colour (recent version needed, see below): -# pip3 install colour-science - -# Maximum delta allowed, above this value the difference can be detected -MAX_DELTA_E = 2.3 -MAX_AVG_DELTA_E = MAX_DELTA_E / 3. - -import cv2 -import colour -import numpy -import os -import sys - -if "delta_E" not in dir(colour): - print(" Unable to compute delta-E, please upgrade python3-colour-science") - exit(0) - -expected = sys.argv[1] -output = sys.argv[2] - -expected_rgb = cv2.imread(expected) -output_rgb = cv2.imread(output) - -expected_lab = cv2.cvtColor(expected_rgb, cv2.COLOR_RGB2Lab) -output_lab = cv2.cvtColor(output_rgb, cv2.COLOR_RGB2Lab) - -delta_E = colour.delta_E(expected_lab, output_lab, method="CIE 2000") - -num_elem = delta_E.size - -max_dE = numpy.amax(delta_E) -mean_dE = numpy.mean(delta_E) -std_dE = numpy.std(delta_E) - -print(" ----------------------------------") -print(" Max dE : %.5f" % max_dE) -print(" Avg dE : %.5f" % mean_dE) -print(" Std dE : %.5f" % std_dE) -print(" ----------------------------------") - -count_below_avg = numpy.sum(delta_E <= mean_dE) -print(" Pixels below avg + 0 std : %.2f %%" % (count_below_avg / num_elem * 100.)) - -count_below_avg = numpy.sum(delta_E <= mean_dE + std_dE) -print(" Pixels below avg + 1 std : %.2f %%" % (count_below_avg / num_elem * 100.)) - -count_below_avg = numpy.sum(delta_E <= mean_dE + 3. * std_dE) -print(" Pixels below avg + 3 std : %.2f %%" % (count_below_avg / num_elem * 100.)) - -count_below_avg = numpy.sum(delta_E <= mean_dE + 6. * std_dE) -print(" Pixels below avg + 6 std : %.2f %%" % (count_below_avg / num_elem * 100.)) - -count_below_avg = numpy.sum(delta_E <= mean_dE + 9. * std_dE) -print(" Pixels below avg + 9 std : %.2f %%" % (count_below_avg / num_elem * 100.)) - -print(" ----------------------------------") - -count_above = numpy.sum(delta_E >= MAX_DELTA_E) -print(" Pixels above tolerance : %.2f %%" % (count_above / num_elem * 100.)) - -if(max_dE > MAX_DELTA_E or mean_dE > MAX_AVG_DELTA_E): - exit(2) -elif(max_dE < 0.01): - exit(0) -else: - exit(1) diff --git a/src/tests/integration/images/mire1-xtrans.raf b/src/tests/integration/images/mire1-xtrans.raf deleted file mode 100644 index 8c9f58a6c039..000000000000 Binary files a/src/tests/integration/images/mire1-xtrans.raf and /dev/null differ diff --git a/src/tests/integration/images/mire1.cr2 b/src/tests/integration/images/mire1.cr2 deleted file mode 100644 index f0d044c87e1c..000000000000 Binary files a/src/tests/integration/images/mire1.cr2 and /dev/null differ diff --git a/src/tests/integration/run.sh b/src/tests/integration/run.sh deleted file mode 100755 index dd0410e6de08..000000000000 --- a/src/tests/integration/run.sh +++ /dev/null @@ -1,241 +0,0 @@ -#!/bin/bash - -# To run darktable-cli must be found, either -# -# 1. Put darktable-cli in the PATH -# 2. Set DARKTABLE_CLI to the full pathname of darktable-cli executable -# -# To run the test suite: -# -# ./run.sh - will run all tests -# ./run.sh 0001-exposure - will run the single tests 0001-exposure -# -# Options: -# -# --disable-opencl - do not run the OpenCL path -# --no-deltae - do a light check not requiring Delta-E module -# --fast-fail - abort testing on the first NOK test -# --op= | --operation= - run test with matching operation n - -CDPATH= - -CLI=${DARKTABLE_CLI:-darktable-cli} -TEST_IMAGES=$PWD/images - -TESTS="" -TEST_COUNT=0 -TEST_ERROR=0 -COMPARE=$(which compare) -DO_OPENCL=yes -DO_DELTAE=yes -DO_FAST_FAIL=no - -[ -z $(which $CLI) ] && echo Make sure $CLI is in the path && exit 1 - -set -- $(getopt -q -u -o : -l disable-opencl,no-deltae,fast-fail,op:,operation: -- $*) - -while [ $# -gt 0 ]; do - case $1 in - --disable-opencl) - DO_OPENCL=no - ;; - --no-deltae) - DO_DELTAE=no - ;; - --fast-fail) - DO_FAST_FAIL=yes - ;; - --op|--operation) - shift - OP=$1 - TESTS=$(grep -l "operation=\"$OP\"" */*.xmp | while read xmp; do echo $(dirname $xmp); done) - [ -z "$TESTS" ] && echo error: operation $OP did not macth any test && exit 1 - ;; - (--) - ;; - (*) - TESTS="$TESTS $(basename $1)" - ;; - (-*) - echo "$0: error - unrecognized option $1" - exit 1 - ;; - esac - shift -done - -[ -z "$TESTS" ] && TESTS="$(ls -d [0-9]*)" - -for dir in $TESTS; do - echo Test $dir - TEST_COUNT=$((TEST_COUNT + 1)) - - if [ -f $dir/test.sh ]; then - # The test has a specific driver - ( - $dir/test.sh - ) - - if [ $? = 0 ]; then - echo " OK" - else - echo " FAILS: specific test" - TEST_ERROR=$((TEST_ERROR + 1)) - fi - - else - # A standard test - # - xmp to create the output - # - expected. is the expected output - # - a diff is made to compute the max Delta-E - ( - cd $dir - - # remove leading "????-" - - TEST=${dir:5} - - [ ! -f $TEST.xmp ] && - echo missing $dir.xmp && exit 1 - - [ ! -f expected.png ] && echo " missing expected.png" - - IMAGE=$(grep DerivedFrom $TEST.xmp | cut -d'"' -f2) - - echo " Image $IMAGE" - - # Remove previous output and diff if any - - rm -f output*.png diff*.png - - # Create the output - # - # Note that we force host_memory_limit has this will have - # impact on the tiling and will change the output. - # - # This means that the tiling algorithm is probably broken. - # - - # All common core options: - CORE_OPTIONS="--conf host_memory_limit=8192 \ - --conf worker_threads=4 -t 4 \ - --conf plugins/lighttable/export/force_lcms2=FALSE \ - --conf plugins/lighttable/export/iccintent=0" - - # Some // loops seems to not honor the omp_set_num_threads() in - # darktable.c (this is needed to run 0068-rawdenoise-xtrans on - # different configurations) - - export OMP_THREAD_LIMIT=4 - - $CLI --width 2048 --height 2048 \ - --hq true --apply-custom-presets false \ - "$TEST_IMAGES/$IMAGE" "$TEST.xmp" output.png \ - --core --disable-opencl $CORE_OPTIONS 1> /dev/null 2> /dev/null - - res=$? - - if [ $DO_OPENCL == yes ]; then - $CLI --width 2048 --height 2048 \ - --hq true --apply-custom-presets false \ - "$TEST_IMAGES/$IMAGE" "$TEST.xmp" output-cl.png \ - --core $CORE_OPTIONS 1> /dev/null 2> /dev/null - - res=$((res + $?)) - fi - - # If all ok, check Delta-E - - if [ $res -eq 0 ]; then - if [ ! -z "$COMPARE" -a $DO_OPENCL == yes ]; then - diffcount="$($COMPARE output.png output-cl.png -metric ae diff-cl.png 2>&1 )" - - if [ $? -ne 0 ]; then - echo " CPU & GPU version differ by ${diffcount} pixels" - fi - fi - - if [ $DO_DELTAE == yes ]; then - if [ -f expected.png ]; then - ../deltae expected.png output.png - else - false - fi - - res=$? - - if [ $res -lt 2 ]; then - echo " OK" - if [ $res = 1 ]; then - diffcount="$($COMPARE expected.png output.png -metric ae diff-ok.png 2>&1 )" - fi - res=0 - - else - echo " FAILS: image visually changed" - if [ ! -z $COMPARE -a -f expected.png ]; then - diffcount="$($COMPARE expected.png output.png -metric ae diff.png 2>&1 )" - echo " see diff.png for visual difference" - echo " (${diffcount} pixels changed)" - fi - fi - else - if [ -z $COMPARE ]; then - echo "no delta-e mode : required compare tool not found." - res=1 - else - diffcount="$($COMPARE expected.png output.png -metric ae diff-ok.png 2>&1 )" - - # if we have an exponent just pretend this is a number - # above 2000 which is the limit checked below. - - if [[ $diffcount =~ e ]]; then - diffcount=50000 - fi - - if [[ $diffcount -lt 2000 ]]; then - echo " Light check : OK" - res=0 - else - echo " Light check : NOK" - res=1 - fi - fi - fi - else - echo " FAILS : darktable-cli errored" - res=1 - fi - - if [ ! -f expected.png ]; then - echo " copy output.png to expected.png" - echo " optimize size of expected.png" - - if [ -z $(which zopflipng) ]; then - echo - echo " ERROR: please install zopflipng tool." - exit 1 - fi - - zopflipng output.png expected.png 1> /dev/null 2>&1 - - echo " check that expected.png is correct:" - echo " \$ eog $(basename $PWD)/expected.png" - fi - - exit $res - ) - - if [ $? -ne 0 ]; then - TEST_ERROR=$((TEST_ERROR + 1)) - - [ $DO_FAST_FAIL == yes ] && break; - fi - fi - - echo -done - -echo -echo "Total test $TEST_COUNT" -echo "Errors $TEST_ERROR"