test: Fix tests that were writing into ref (#4418)
openexr_copy and openexr-decreasingy These recently added test were writing into the ref/ directory, which they certainly should not do. Write into the build test area, compare to what's in the ref area. Signed-off-by: Larry Gritz <lg@larrygritz.com>
This commit is contained in:
Larry Gritz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,10 +1,10 @@
|
||||
Comparing "compressed-b44.exr" and "ref/compressed-b44.exr"
|
||||
PASS
|
||||
Comparing "compressed-b44a.exr" and "ref/compressed-b44a.exr"
|
||||
PASS
|
||||
Comparing "compressed-dwaa.exr" and "ref/compressed-dwaa.exr"
|
||||
PASS
|
||||
Comparing "compressed-dwab.exr" and "ref/compressed-dwab.exr"
|
||||
PASS
|
||||
Comparing "compressed-pxr24.exr" and "ref/compressed-pxr24.exr"
|
||||
PASS
|
||||
Comparing "compressed-pxr24.exr" and "ref/compressed-pxr24.exr"
|
||||
PASS
|
||||
Comparing "compressed-b44.exr" and "ref/compressed-b44.exr"
|
||||
PASS
|
||||
Comparing "compressed-b44a.exr" and "ref/compressed-b44a.exr"
|
||||
PASS
|
||||
Comparing "compressed-dwaa.exr" and "ref/compressed-dwaa.exr"
|
||||
PASS
|
||||
Comparing "compressed-dwab.exr" and "ref/compressed-dwab.exr"
|
||||
PASS
|
||||
|
||||
@@ -15,11 +15,11 @@ import os, sys
|
||||
redirect = " >> out.txt 2>&1 "
|
||||
|
||||
# Create some test images we need
|
||||
command += oiiotool("../common/tahoe-tiny.tif --compression pxr24 -o ref/compressed-pxr24.exr")
|
||||
command += oiiotool("../common/tahoe-tiny.tif --compression b44 -o ref/compressed-b44.exr")
|
||||
command += oiiotool("../common/tahoe-tiny.tif --compression b44a -o ref/compressed-b44a.exr")
|
||||
command += oiiotool("../common/tahoe-tiny.tif --compression dwaa -o ref/compressed-dwaa.exr")
|
||||
command += oiiotool("../common/tahoe-tiny.tif --compression dwab -o ref/compressed-dwab.exr")
|
||||
command += oiiotool("../common/tahoe-tiny.tif --compression pxr24 -o compressed-pxr24.exr")
|
||||
command += oiiotool("../common/tahoe-tiny.tif --compression b44 -o compressed-b44.exr")
|
||||
command += oiiotool("../common/tahoe-tiny.tif --compression b44a -o compressed-b44a.exr")
|
||||
command += oiiotool("../common/tahoe-tiny.tif --compression dwaa -o compressed-dwaa.exr")
|
||||
command += oiiotool("../common/tahoe-tiny.tif --compression dwab -o compressed-dwab.exr")
|
||||
|
||||
# Run the recompression test script
|
||||
command += pythonbin + " src/test_recompression.py;"
|
||||
@@ -31,6 +31,7 @@ outputs = [
|
||||
"compressed-b44a.exr",
|
||||
"compressed-dwaa.exr",
|
||||
"compressed-dwab.exr",
|
||||
"out.txt"
|
||||
]
|
||||
|
||||
# OpenEXRInputCore is not supported yet. TODO: update this once it's implemented.
|
||||
|
||||
@@ -1,74 +1,56 @@
|
||||
Reading ref/decreasingY-resize.exr
|
||||
ref/decreasingY-resize.exr : 4080 x 3072, 3 channel, half openexr
|
||||
SHA-1: 34A9F9879CD89E718ABCEE718A779035F6F78666
|
||||
Reading increasingY-resize.exr
|
||||
increasingY-resize.exr : 4080 x 3072, 3 channel, half openexr
|
||||
channel list: R, G, B
|
||||
compression: "zip"
|
||||
DateTime: "2013:04:16 10:20:35"
|
||||
Orientation: 1 (normal)
|
||||
PixelAspectRatio: 1
|
||||
ResolutionUnit: "in"
|
||||
screenWindowCenter: 0, 0
|
||||
screenWindowWidth: 1
|
||||
Software: "OpenImageIO 2.6.2.0dev : oiiotool ../common/tahoe-tiny.tif --resize 4080x3072 -o ref/decreasingY-resize.exr"
|
||||
XResolution: 72
|
||||
YResolution: 72
|
||||
Exif:ImageHistory: "oiiotool ../common/tahoe-tiny.tif --resize 4080x3072 -o ref/decreasingY-resize.exr"
|
||||
oiio:ColorSpace: "Linear"
|
||||
oiio:subimages: 1
|
||||
Reading ref/decreasingY-copy.exr
|
||||
ref/decreasingY-copy.exr : 4080 x 3072, 3 channel, half openexr
|
||||
SHA-1: 34A9F9879CD89E718ABCEE718A779035F6F78666
|
||||
Reading increasingY-copy.exr
|
||||
increasingY-copy.exr : 4080 x 3072, 3 channel, half openexr
|
||||
channel list: R, G, B
|
||||
compression: "zip"
|
||||
DateTime: "2013:04:16 10:20:35"
|
||||
Orientation: 1 (normal)
|
||||
PixelAspectRatio: 1
|
||||
ResolutionUnit: "in"
|
||||
screenWindowCenter: 0, 0
|
||||
screenWindowWidth: 1
|
||||
Software: "OpenImageIO 2.6.2.0dev : oiiotool ref/decreasingY-resize.exr -o ref/decreasingY-copy.exr"
|
||||
XResolution: 72
|
||||
YResolution: 72
|
||||
Exif:ImageHistory: "oiiotool ../common/tahoe-tiny.tif --resize 4080x3072 -o ref/decreasingY-resize.exr
|
||||
oiiotool ref/decreasingY-resize.exr -o ref/decreasingY-copy.exr"
|
||||
oiio:ColorSpace: "Linear"
|
||||
oiio:subimages: 1
|
||||
Reading decreasingY-resize.exr
|
||||
decreasingY-resize.exr : 4080 x 3072, 3 channel, half openexr
|
||||
SHA-1: 34A9F9879CD89E718ABCEE718A779035F6F78666
|
||||
channel list: R, G, B
|
||||
compression: "zip"
|
||||
DateTime: "2013:04:16 10:20:35"
|
||||
Orientation: 1 (normal)
|
||||
PixelAspectRatio: 1
|
||||
ResolutionUnit: "in"
|
||||
screenWindowCenter: 0, 0
|
||||
screenWindowWidth: 1
|
||||
Software: "OpenImageIO 2.6.2.0dev : oiiotool ../common/tahoe-tiny.tif --resize 4080x3072 --attrib openexr:lineOrder decreasingY -o decreasingY-resize.exr"
|
||||
XResolution: 72
|
||||
YResolution: 72
|
||||
Exif:ImageHistory: "oiiotool ../common/tahoe-tiny.tif --resize 4080x3072 --attrib openexr:lineOrder decreasingY -o decreasingY-resize.exr"
|
||||
oiio:ColorSpace: "Linear"
|
||||
oiio:subimages: 1
|
||||
Reading decreasingY-copy.exr
|
||||
decreasingY-copy.exr : 4080 x 3072, 3 channel, half openexr
|
||||
SHA-1: 34A9F9879CD89E718ABCEE718A779035F6F78666
|
||||
channel list: R, G, B
|
||||
compression: "zip"
|
||||
DateTime: "2013:04:16 10:20:35"
|
||||
Orientation: 1 (normal)
|
||||
PixelAspectRatio: 1
|
||||
ResolutionUnit: "in"
|
||||
screenWindowCenter: 0, 0
|
||||
screenWindowWidth: 1
|
||||
Software: "OpenImageIO 2.6.2.0dev : oiiotool ref/decreasingY-resize.exr --attrib openexr:lineOrder decreasingY -o decreasingY-copy.exr"
|
||||
XResolution: 72
|
||||
YResolution: 72
|
||||
Exif:ImageHistory: "oiiotool ../common/tahoe-tiny.tif --resize 4080x3072 -o ref/decreasingY-resize.exr
|
||||
oiiotool ref/decreasingY-resize.exr --attrib openexr:lineOrder decreasingY -o decreasingY-copy.exr"
|
||||
oiio:ColorSpace: "Linear"
|
||||
oiio:subimages: 1
|
||||
Comparing "decreasingY-resize.exr" and "ref/decreasingY-resize.exr"
|
||||
Comparing "increasingY-copy.exr" and "decreasingY-copy.exr"
|
||||
PASS
|
||||
Comparing "decreasingY-copy.exr" and "ref/decreasingY-copy.exr"
|
||||
Comparing "increasingY-resize.exr" and "decreasingY-resize.exr"
|
||||
PASS
|
||||
|
||||
@@ -15,27 +15,30 @@ redirect = " >> out.txt 2>&1 "
|
||||
|
||||
# Create reference images stored in increasingY order (default)
|
||||
# Resizing to a large image size to ensure scanline chunking logic is triggered.
|
||||
command += oiiotool("../common/tahoe-tiny.tif --resize 4080x3072 -o ref/decreasingY-resize.exr")
|
||||
command += info_command("ref/decreasingY-resize.exr")
|
||||
command += oiiotool("ref/decreasingY-resize.exr -o ref/decreasingY-copy.exr")
|
||||
command += info_command("ref/decreasingY-copy.exr")
|
||||
command += oiiotool("../common/tahoe-tiny.tif --resize 4080x3072 -o increasingY-resize.exr")
|
||||
command += info_command("increasingY-resize.exr", safematch=True, hash=False)
|
||||
command += oiiotool("increasingY-resize.exr -o increasingY-copy.exr")
|
||||
command += info_command("increasingY-copy.exr", safematch=True, hash=False)
|
||||
|
||||
# Create an image in decreasing order via resizing (Tests ImageOutput::write_image() logic)
|
||||
command += oiiotool("../common/tahoe-tiny.tif --resize 4080x3072 --attrib openexr:lineOrder decreasingY -o decreasingY-resize.exr")
|
||||
command += info_command("decreasingY-resize.exr")
|
||||
command += info_command("decreasingY-resize.exr", safematch=True, hash=False)
|
||||
|
||||
# Create an image in decreasing order via copying a reference image. (Tests ImageBuf::write() logic)
|
||||
command += oiiotool("ref/decreasingY-resize.exr --attrib openexr:lineOrder decreasingY -o decreasingY-copy.exr")
|
||||
command += info_command("decreasingY-copy.exr")
|
||||
command += oiiotool("decreasingY-resize.exr --attrib openexr:lineOrder decreasingY -o decreasingY-copy.exr")
|
||||
command += info_command("decreasingY-copy.exr", safematch=True, hash=False)
|
||||
|
||||
# They should match
|
||||
command += diff_command("increasingY-copy.exr", "decreasingY-copy.exr")
|
||||
command += diff_command("increasingY-resize.exr", "decreasingY-resize.exr")
|
||||
|
||||
# Outputs to check against references.
|
||||
# This makes sure the images look the same since the line order is a storage detail and should not
|
||||
# change how the image actually looks. These comparisons help verify chunk order and scanlines are
|
||||
# processed properly.
|
||||
outputs = [
|
||||
"decreasingY-resize.exr",
|
||||
"decreasingY-copy.exr",
|
||||
"out.txt"
|
||||
]
|
||||
|
||||
|
||||
#print "Running this command:\n" + command + "\n"
|
||||
#print "Running this command:\n" + command + "\n"
|
||||
|
||||
Reference in New Issue
Block a user