Skip to content

Commit 027f332

Browse files
authored
Update 3.3 CI to current standards (#2170)
Signed-off-by: Cary Phillips <cary@ilm.com>
1 parent 85c1082 commit 027f332

File tree

10 files changed

+63
-1
lines changed

10 files changed

+63
-1
lines changed

.github/workflows/ci_steps.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,42 @@ jobs:
174174
shell: bash
175175

176176
- name: Test
177+
if: ${{ inputs.BUILD_TESTING == 'ON' }}
177178
run: |
179+
set -x
180+
181+
# force downloading of test images, since CMake's file download is flakey
182+
if [[ "$RUNNER_OS" == "Windows" ]]; then
183+
WORKSPACE=$(cygpath -u "$GITHUB_WORKSPACE")
184+
echo "PROGRAM_FILES=$PROGRAM_FILES" >> $GITHUB_ENV
185+
else
186+
WORKSPACE=$GITHUB_WORKSPACE
187+
fi
188+
IMAGES_URL=https://raw.githubusercontent.com/AcademySoftwareFoundation/openexr-images/v1.0
189+
images=(
190+
"TestImages/GrayRampsHorizontal.exr"
191+
"LuminanceChroma/Garden.exr"
192+
"MultiResolution/ColorCodedLevels.exr"
193+
"MultiResolution/WavyLinesLatLong.exr"
194+
"MultiResolution/WavyLinesCube.exr"
195+
"LuminanceChroma/Flowers.exr"
196+
"MultiView/Adjuster.exr"
197+
"Chromaticities/Rec709_YC.exr"
198+
"Chromaticities/Rec709.exr"
199+
"Chromaticities/XYZ_YC.exr"
200+
"Chromaticities/XYZ.exr"
201+
"TestImages/GammaChart.exr"
202+
"Beachball/singlepart.0001.exr"
203+
"v2/LeftView/Balls.exr"
204+
"v2/Stereo/Trunks.exr"
205+
"Beachball/multipart.0001.exr"
206+
)
207+
for image in "${images[@]}"; do
208+
outfile="$WORKSPACE/_build/src/test/bin/$image"
209+
mkdir -p "$(dirname "$outfile")"
210+
curl -L -o "$outfile" "$IMAGES_URL/$image"
211+
done
212+
178213
ctest -T Test -C ${{ inputs.build-type }} --timeout 7200 --output-on-failure -VV
179214
working-directory: _build
180215
shell: bash

share/ci/scripts/install_help2man.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
set -ex
66

77
HELP2MAN_VERSION="1.49.3"
8-
HELP2MAN_URL="https://ftp.gnu.org/gnu/help2man/help2man-$HELP2MAN_VERSION.tar.xz"
8+
HELP2MAN_URL="https://mirror.cs.odu.edu/gnu/help2man/help2man-$HELP2MAN_VERSION.tar.xz"
99
HELP2MAN_DIR="help2man-$HELP2MAN_VERSION"
1010

1111
if [[ $OSTYPE == *msys* ]]; then

src/test/bin/test_exr2aces.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ def cleanup():
5656
atexit.register(cleanup)
5757

5858
image = f"{image_dir}/TestImages/GrayRampsHorizontal.exr"
59+
if not os.path.isfile(image) or os.path.getsize(image) == 0:
60+
sys.exit(f"WARNING: test image {image} is not valid.")
61+
5962
result = run ([exr2aces, "-v", image, outimage], stdout=PIPE, stderr=PIPE, universal_newlines=True)
6063
print(" ".join(result.args))
6164
assert(result.returncode == 0), "\n"+result.stderr

src/test/bin/test_exrheader.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ def find_line(keyword, lines):
5050

5151
# attributes
5252
image = f"{image_dir}/TestImages/GrayRampsHorizontal.exr"
53+
if not os.path.isfile(image) or os.path.getsize(image) == 0:
54+
sys.exit(f"WARNING: test image {image} is not valid.")
55+
5356
result = run ([exrheader, image], stdout=PIPE, stderr=PIPE, universal_newlines=True)
5457
print(" ".join(result.args))
5558
assert(result.returncode == 0), "\n"+result.stderr

src/test/bin/test_exrinfo.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,13 @@
3131
assert(version in result.stdout), "\n"+result.stdout
3232

3333
image = f"{image_dir}/TestImages/GrayRampsHorizontal.exr"
34+
if not os.path.isfile(image) or os.path.getsize(image) == 0:
35+
sys.exit(f"WARNING: test image {image} is not valid.")
36+
3437
result = run ([exrinfo, image, "-a", "-v"], stdout=PIPE, stderr=PIPE, universal_newlines=True)
3538
print(" ".join(result.args))
39+
print(f"result.stdout: {result.stdout}")
40+
print(f"result.stderr: {result.stderr}")
3641
assert(result.returncode == 0), "\n"+result.stderr
3742
output = result.stdout.split('\n')
3843
try:

src/test/bin/test_exrmakepreview.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ def cleanup():
5656
atexit.register(cleanup)
5757

5858
image = f"{image_dir}/TestImages/GrayRampsHorizontal.exr"
59+
if not os.path.isfile(image) or os.path.getsize(image) == 0:
60+
sys.exit(f"WARNING: test image {image} is not valid.")
61+
5962
result = run ([exrmakepreview, "-w", "50", "-e", "1", "-v", image, outimage], stdout=PIPE, stderr=PIPE, universal_newlines=True)
6063
print(" ".join(result.args))
6164
assert(result.returncode == 0), "\n"+result.stderr

src/test/bin/test_exrmaketiled.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
version = sys.argv[4]
1515

1616
image = f"{image_dir}/TestImages/GammaChart.exr"
17+
if not os.path.isfile(image) or os.path.getsize(image) == 0:
18+
sys.exit(f"WARNING: test image {image} is not valid.")
1719

1820
assert(os.path.isfile(exrmaketiled)), "\nMissing " + exrmaketiled
1921
assert(os.path.isfile(exrinfo)), "\nMissing " + exrinfo

src/test/bin/test_exrmetrics.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ def cleanup():
5656
assert("Missing" in result.stderr),"expected 'Missing argument' error"
5757

5858
for image in [f"{image_dir}/TestImages/GrayRampsHorizontal.exr",f"{image_dir}/Beachball/multipart.0001.exr",f"{image_dir}/LuminanceChroma/Flowers.exr"]:
59+
if not os.path.isfile(image) or os.path.getsize(image) == 0:
60+
sys.exit(f"WARNING: test image {image} is not valid.")
61+
5962
for time in ["none","read","write","reread","read,write","read,reread","read,write,reread"]:
6063
for passes in ["1","2"]:
6164
for nosize in range(0,2):

src/test/bin/test_exrmultiview.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,12 @@
3737
assert(version in result.stdout), "\n"+result.stdout
3838

3939
left_image = f"{image_dir}/TestImages/GammaChart.exr"
40+
if not os.path.isfile(left_image) or os.path.getsize(left_image) == 0:
41+
sys.exit(f"WARNING: test image {left_image} is not valid.")
42+
4043
right_image = f"{image_dir}/TestImages/GrayRampsHorizontal.exr"
44+
if not os.path.isfile(right_image) or os.path.getsize(right_image) == 0:
45+
sys.exit(f"WARNING: test image {right_image} is not valid.")
4146

4247
fd, outimage = tempfile.mkstemp(".exr")
4348
os.close(fd)

src/test/bin/test_exrstdattr.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ def cleanup():
9494
for a in attrs:
9595
command += a
9696
image = f"{image_dir}/TestImages/GrayRampsHorizontal.exr"
97+
if not os.path.isfile(image) or os.path.getsize(image) == 0:
98+
sys.exit(f"WARNING: test image {image} is not valid.")
99+
97100
command += [image, outimage]
98101

99102
result = run (command, stdout=PIPE, stderr=PIPE, universal_newlines=True)

0 commit comments

Comments
 (0)