Skip to content

Commit 1449b46

Browse files
lgritzlgritz
authored
CI: Fix iinfo test so it works on windows (#3706)
1 parent ed3dc51 commit 1449b46

File tree

7 files changed

+52
-52
lines changed

7 files changed

+52
-52
lines changed

‎testsuite/iinfo/ref/out-fmt6.txt‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -133,22 +133,22 @@
133133
Constant: No
134134
Monochrome: No
135135
Total size: 4.0 MB
136-
data/tiny-az.exr : 4 x 4, 3 channel, float openexr
137-
data/tiny-az.exr : SHA-1: 2556575B7F2398D97FCF2C5CFCBAB741050AC155
138-
data/tiny-az.exr : channel list: R, G, B
139-
data/tiny-az.exr : pixel data origin: x=2, y=2
140-
data/tiny-az.exr : full/display size: 20 x 20
141-
data/tiny-az.exr : full/display origin: 1, 1
142-
data/tiny-az.exr : compression: "zip"
143-
data/tiny-az.exr : DateTime: "2022:11:23 15:17:24"
144-
data/tiny-az.exr : PixelAspectRatio: 1
145-
data/tiny-az.exr : screenWindowCenter: 0, 0
146-
data/tiny-az.exr : screenWindowWidth: 1
147-
data/tiny-az.exr : Software: "OpenImageIO 2.5.0.0spi : oiiotool -pattern constant:color=0.25,0.5,0.75 4x4 3 --origin +2+2 --fullsize 20x20+1+1 -o tiny-az.exr"
148-
data/tiny-az.exr : Exif:ImageHistory: "oiiotool -pattern constant:color=0.25,0.5,0.75 4x4 3 --origin +2+2 --fullsize 20x20+1+1 -o tiny-az.exr"
149-
data/tiny-az.exr : oiio:ColorSpace: "Linear"
150-
data/tiny-az.exr : oiio:subimages: 1
151-
data/tiny-az.exr : Stats Min: 0.250000 0.500000 0.750000 (float)
136+
src/tiny-az.exr : 4 x 4, 3 channel, float openexr
137+
src/tiny-az.exr : SHA-1: 2556575B7F2398D97FCF2C5CFCBAB741050AC155
138+
src/tiny-az.exr : channel list: R, G, B
139+
src/tiny-az.exr : pixel data origin: x=2, y=2
140+
src/tiny-az.exr : full/display size: 20 x 20
141+
src/tiny-az.exr : full/display origin: 1, 1
142+
src/tiny-az.exr : compression: "zip"
143+
src/tiny-az.exr : DateTime: "2022:11:23 15:17:24"
144+
src/tiny-az.exr : PixelAspectRatio: 1
145+
src/tiny-az.exr : screenWindowCenter: 0, 0
146+
src/tiny-az.exr : screenWindowWidth: 1
147+
src/tiny-az.exr : Software: "OpenImageIO 2.5.0.0spi : oiiotool -pattern constant:color=0.25,0.5,0.75 4x4 3 --origin +2+2 --fullsize 20x20+1+1 -o tiny-az.exr"
148+
src/tiny-az.exr : Exif:ImageHistory: "oiiotool -pattern constant:color=0.25,0.5,0.75 4x4 3 --origin +2+2 --fullsize 20x20+1+1 -o tiny-az.exr"
149+
src/tiny-az.exr : oiio:ColorSpace: "Linear"
150+
src/tiny-az.exr : oiio:subimages: 1
151+
src/tiny-az.exr : Stats Min: 0.250000 0.500000 0.750000 (float)
152152
Stats Max: 0.250000 0.500000 0.750000 (float)
153153
Stats Avg: 0.250000 0.500000 0.750000 (float)
154154
Stats StdDev: 0.000000 0.000000 0.000000 (float)
@@ -159,8 +159,8 @@ data/tiny-az.exr : Stats Min: 0.250000 0.500000 0.750000 (float)
159159
Constant Color: 0.250000 0.500000 0.750000 (float)
160160
Monochrome: No
161161
info from oiiotool:
162-
Reading data/tiny-az.exr
163-
data/tiny-az.exr : 4 x 4, 3 channel, float openexr
162+
Reading src/tiny-az.exr
163+
src/tiny-az.exr : 4 x 4, 3 channel, float openexr
164164
SHA-1: 2556575B7F2398D97FCF2C5CFCBAB741050AC155
165165
channel list: R, G, B
166166
pixel data origin: x=2, y=2
@@ -201,7 +201,7 @@ data/tiny-az.exr : 4 x 4, 3 channel, float openexr
201201
Constant: Yes
202202
Constant Color: 0.250000 0.500000 0.750000 (float)
203203
Monochrome: No
204-
data/tinydeep.exr : 4 x 4, 2 channel, deep float openexr
204+
src/tinydeep.exr : 4 x 4, 2 channel, deep float openexr
205205
SHA-1: 941FD2E69D58EB30EE29AD3F71720C3831AAD914
206206
channel list: A, Z
207207
compression: "zips"
@@ -235,8 +235,8 @@ data/tinydeep.exr : 4 x 4, 2 channel, deep float openexr
235235
Minimum depth was 10 at (2, 2)
236236
Maximum depth was 10 at (2, 2)
237237
info from oiiotool:
238-
Reading data/tinydeep.exr
239-
data/tinydeep.exr : 4 x 4, 2 channel, deep float openexr
238+
Reading src/tinydeep.exr
239+
src/tinydeep.exr : 4 x 4, 2 channel, deep float openexr
240240
SHA-1: 941FD2E69D58EB30EE29AD3F71720C3831AAD914
241241
channel list: A, Z
242242
compression: "zips"
@@ -348,7 +348,7 @@ Reading tmp.tif
348348
<attrib name="compression" type="string">zip</attrib>
349349
<attrib name="tiff:RowsPerStrip" type="int">32</attrib>
350350
</ImageSpec>
351-
data/subimage.tif : 2 x 2, 3 channel, uint8 tiff
351+
src/subimage.tif : 2 x 2, 3 channel, uint8 tiff
352352
3 subimages: 2x2 [u8,u8,u8], 2x2 [u8,u8,u8], 2x2 [u8,u8,u8]
353353
subimage 0: 2 x 2, 3 channel, uint8 tiff
354354
SHA-1: 39754B9B5BF224DA2869627680D5853D787E794F
@@ -419,7 +419,7 @@ data/subimage.tif : 2 x 2, 3 channel, uint8 tiff
419419
Constant: Yes
420420
Constant Color: 64.00 128.00 191.00 (of 255)
421421
Monochrome: No
422-
data/mip.tif : 2 x 2, 3 channel, uint8 tiff
422+
src/mip.tif : 2 x 2, 3 channel, uint8 tiff
423423
MIP-map levels: 2x2 1x1
424424
SHA-1: 39754B9B5BF224DA2869627680D5853D787E794F
425425
channel list: R, G, B

‎testsuite/iinfo/ref/out.txt‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -133,22 +133,22 @@
133133
Constant: No
134134
Monochrome: No
135135
Total size: 4.0 MB
136-
data/tiny-az.exr : 4 x 4, 3 channel, float openexr
137-
data/tiny-az.exr : SHA-1: 2556575B7F2398D97FCF2C5CFCBAB741050AC155
138-
data/tiny-az.exr : channel list: R, G, B
139-
data/tiny-az.exr : pixel data origin: x=2, y=2
140-
data/tiny-az.exr : full/display size: 20 x 20
141-
data/tiny-az.exr : full/display origin: 1, 1
142-
data/tiny-az.exr : compression: "zip"
143-
data/tiny-az.exr : DateTime: "2022:11:23 15:17:24"
144-
data/tiny-az.exr : PixelAspectRatio: 1
145-
data/tiny-az.exr : screenWindowCenter: 0, 0
146-
data/tiny-az.exr : screenWindowWidth: 1
147-
data/tiny-az.exr : Software: "OpenImageIO 2.5.0.0spi : oiiotool -pattern constant:color=0.25,0.5,0.75 4x4 3 --origin +2+2 --fullsize 20x20+1+1 -o tiny-az.exr"
148-
data/tiny-az.exr : Exif:ImageHistory: "oiiotool -pattern constant:color=0.25,0.5,0.75 4x4 3 --origin +2+2 --fullsize 20x20+1+1 -o tiny-az.exr"
149-
data/tiny-az.exr : oiio:ColorSpace: "Linear"
150-
data/tiny-az.exr : oiio:subimages: 1
151-
data/tiny-az.exr : Stats Min: 0.250000 0.500000 0.750000 (float)
136+
src/tiny-az.exr : 4 x 4, 3 channel, float openexr
137+
src/tiny-az.exr : SHA-1: 2556575B7F2398D97FCF2C5CFCBAB741050AC155
138+
src/tiny-az.exr : channel list: R, G, B
139+
src/tiny-az.exr : pixel data origin: x=2, y=2
140+
src/tiny-az.exr : full/display size: 20 x 20
141+
src/tiny-az.exr : full/display origin: 1, 1
142+
src/tiny-az.exr : compression: "zip"
143+
src/tiny-az.exr : DateTime: "2022:11:23 15:17:24"
144+
src/tiny-az.exr : PixelAspectRatio: 1
145+
src/tiny-az.exr : screenWindowCenter: 0, 0
146+
src/tiny-az.exr : screenWindowWidth: 1
147+
src/tiny-az.exr : Software: "OpenImageIO 2.5.0.0spi : oiiotool -pattern constant:color=0.25,0.5,0.75 4x4 3 --origin +2+2 --fullsize 20x20+1+1 -o tiny-az.exr"
148+
src/tiny-az.exr : Exif:ImageHistory: "oiiotool -pattern constant:color=0.25,0.5,0.75 4x4 3 --origin +2+2 --fullsize 20x20+1+1 -o tiny-az.exr"
149+
src/tiny-az.exr : oiio:ColorSpace: "Linear"
150+
src/tiny-az.exr : oiio:subimages: 1
151+
src/tiny-az.exr : Stats Min: 0.250000 0.500000 0.750000 (float)
152152
Stats Max: 0.250000 0.500000 0.750000 (float)
153153
Stats Avg: 0.250000 0.500000 0.750000 (float)
154154
Stats StdDev: 0.000000 0.000000 0.000000 (float)
@@ -159,8 +159,8 @@ data/tiny-az.exr : Stats Min: 0.250000 0.500000 0.750000 (float)
159159
Constant Color: 0.250000 0.500000 0.750000 (float)
160160
Monochrome: No
161161
info from oiiotool:
162-
Reading data/tiny-az.exr
163-
data/tiny-az.exr : 4 x 4, 3 channel, float openexr
162+
Reading src/tiny-az.exr
163+
src/tiny-az.exr : 4 x 4, 3 channel, float openexr
164164
SHA-1: 2556575B7F2398D97FCF2C5CFCBAB741050AC155
165165
channel list: R, G, B
166166
pixel data origin: x=2, y=2
@@ -201,7 +201,7 @@ data/tiny-az.exr : 4 x 4, 3 channel, float openexr
201201
Constant: Yes
202202
Constant Color: 0.250000 0.500000 0.750000 (float)
203203
Monochrome: No
204-
data/tinydeep.exr : 4 x 4, 2 channel, deep float openexr
204+
src/tinydeep.exr : 4 x 4, 2 channel, deep float openexr
205205
SHA-1: 941FD2E69D58EB30EE29AD3F71720C3831AAD914
206206
channel list: A, Z
207207
compression: "zips"
@@ -235,8 +235,8 @@ data/tinydeep.exr : 4 x 4, 2 channel, deep float openexr
235235
Minimum depth was 10 at (2, 2)
236236
Maximum depth was 10 at (2, 2)
237237
info from oiiotool:
238-
Reading data/tinydeep.exr
239-
data/tinydeep.exr : 4 x 4, 2 channel, deep float openexr
238+
Reading src/tinydeep.exr
239+
src/tinydeep.exr : 4 x 4, 2 channel, deep float openexr
240240
SHA-1: 941FD2E69D58EB30EE29AD3F71720C3831AAD914
241241
channel list: A, Z
242242
compression: "zips"
@@ -348,7 +348,7 @@ Reading tmp.tif
348348
<attrib name="compression" type="string">zip</attrib>
349349
<attrib name="tiff:RowsPerStrip" type="int">32</attrib>
350350
</ImageSpec>
351-
data/subimage.tif : 2 x 2, 3 channel, uint8 tiff
351+
src/subimage.tif : 2 x 2, 3 channel, uint8 tiff
352352
3 subimages: 2x2 [u8,u8,u8], 2x2 [u8,u8,u8], 2x2 [u8,u8,u8]
353353
subimage 0: 2 x 2, 3 channel, uint8 tiff
354354
SHA-1: 39754B9B5BF224DA2869627680D5853D787E794F
@@ -419,7 +419,7 @@ data/subimage.tif : 2 x 2, 3 channel, uint8 tiff
419419
Constant: Yes
420420
Constant Color: 64.00 128.00 191.00 (of 255)
421421
Monochrome: No
422-
data/mip.tif : 2 x 2, 3 channel, uint8 tiff
422+
src/mip.tif : 2 x 2, 3 channel, uint8 tiff
423423
MIP-map levels: 2x2 1x1
424424
SHA-1: 39754B9B5BF224DA2869627680D5853D787E794F
425425
channel list: R, G, B

‎testsuite/iinfo/run.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
command += info_command ("-s --stats ../common/textures/grid.tx", info_program="iinfo")
44

55
# command += oiiotool ("-pattern constant:color=0.25,0.5,0.75 4x4 3 --origin +2+2 --fullsize 20x20+1+1 -o tiny-az.exr")
6-
command += info_command ("-f -v --hash --stats data/tiny-az.exr", info_program="iinfo")
7-
command += info_command ("--echo \"info from oiiotool:\" --hash --stats --dumpdata data/tiny-az.exr", info_program="oiiotool")
6+
command += info_command ("-f -v --hash --stats src/tiny-az.exr", info_program="iinfo")
7+
command += info_command ("--echo \"info from oiiotool:\" --hash --stats --dumpdata src/tiny-az.exr", info_program="oiiotool")
88

99
# Get iinfo coverage of a deep file
1010
# command += oiiotool ("-pattern constant:color=1e38,0 4x4 2 --chnames Z,A"
1111
# " --point:color=10.0,1.0 2,2 --deepen -o tinydeep.exr")
12-
command += info_command ("-v --hash --stats data/tinydeep.exr", info_program="iinfo")
13-
command += info_command ("--echo \"info from oiiotool:\" --hash --stats --dumpdata data/tinydeep.exr", info_program="oiiotool")
12+
command += info_command ("-v --hash --stats src/tinydeep.exr", info_program="iinfo")
13+
command += info_command ("--echo \"info from oiiotool:\" --hash --stats --dumpdata src/tinydeep.exr", info_program="oiiotool")
1414

1515
# Dump of a flat integer file
1616
command += oiiotool ("-pattern constant:color=0.25,0.5,0.75 2x2 3 -d uint8 -o tmp.tif")
@@ -23,5 +23,5 @@
2323
command += info_command ("--info:format=xml tmp.tif", safematch=True)
2424

2525
# Info for subimages and mips
26-
command += info_command ("--stats data/subimage.tif", info_program="iinfo")
27-
command += info_command ("--stats data/mip.tif", info_program="iinfo")
26+
command += info_command ("--stats src/subimage.tif", info_program="iinfo")
27+
command += info_command ("--stats src/mip.tif", info_program="iinfo")

‎testsuite/iinfo/mip.tif‎ renamed to ‎testsuite/iinfo/src/mip.tif‎

File renamed without changes.

‎testsuite/iinfo/subimage.tif‎ renamed to ‎testsuite/iinfo/src/subimage.tif‎

File renamed without changes.

‎testsuite/iinfo/tiny-az.exr‎ renamed to ‎testsuite/iinfo/src/tiny-az.exr‎

File renamed without changes.

‎testsuite/iinfo/tinydeep.exr‎ renamed to ‎testsuite/iinfo/src/tinydeep.exr‎

File renamed without changes.

0 commit comments

Comments
 (0)