diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c556c93d1..2a7dc0333 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -326,7 +326,7 @@ jobs: LLVM_VERSION=14.0.0 LLVM_DISTRO_NAME=ubuntu-18.04 PUGIXML_VERSION=v1.9 CTEST_TEST_TIMEOUT=1800 - OSL_CMAKE_FLAGS="-DOSL_TEST_BIG_TIMEOUT=1800" + OSL_CMAKE_FLAGS="-DOSL_TEST_BIG_TIMEOUT=1200" - desc: gcc10/C++17 llvm14 oiio-2.5 avx2 nametag: linux-2021ish-gcc10-llvm14 runner: ubuntu-22.04 diff --git a/testsuite/render-mx-anisotropic-vdf/ref/out-linux-alt.exr b/testsuite/render-mx-anisotropic-vdf/ref/out-linux-alt.exr old mode 100755 new mode 100644 index e6dda98ff..49c96e913 Binary files a/testsuite/render-mx-anisotropic-vdf/ref/out-linux-alt.exr and b/testsuite/render-mx-anisotropic-vdf/ref/out-linux-alt.exr differ diff --git a/testsuite/render-mx-anisotropic-vdf/ref/out-macos-alt.exr b/testsuite/render-mx-anisotropic-vdf/ref/out-macos-alt.exr deleted file mode 100755 index bf2752507..000000000 Binary files a/testsuite/render-mx-anisotropic-vdf/ref/out-macos-alt.exr and /dev/null differ diff --git a/testsuite/render-mx-anisotropic-vdf/ref/out-optix-alt.exr b/testsuite/render-mx-anisotropic-vdf/ref/out-optix-alt.exr old mode 100755 new mode 100644 index 686fae75c..6a3696c72 Binary files a/testsuite/render-mx-anisotropic-vdf/ref/out-optix-alt.exr and b/testsuite/render-mx-anisotropic-vdf/ref/out-optix-alt.exr differ diff --git a/testsuite/render-mx-anisotropic-vdf/ref/out.exr b/testsuite/render-mx-anisotropic-vdf/ref/out.exr old mode 100755 new mode 100644 index e6dda98ff..fe02bdbca Binary files a/testsuite/render-mx-anisotropic-vdf/ref/out.exr and b/testsuite/render-mx-anisotropic-vdf/ref/out.exr differ diff --git a/testsuite/render-mx-anisotropic-vdf/run.py b/testsuite/render-mx-anisotropic-vdf/run.py index 00fd262d2..5e7dd61fa 100755 --- a/testsuite/render-mx-anisotropic-vdf/run.py +++ b/testsuite/render-mx-anisotropic-vdf/run.py @@ -6,5 +6,7 @@ failthresh = 0.01 failpercent = 1 +allowfailures = 5 + outputs = [ "out.exr" ] -command = testrender("-v -r 196 196 -aa 64 scene.xml out.exr") +command = testrender("-v -r 196 196 -aa 32 scene.xml out.exr") diff --git a/testsuite/render-mx-medium-vdf-glass/ref/out-linux-alt.exr b/testsuite/render-mx-medium-vdf-glass/ref/out-linux-alt.exr old mode 100755 new mode 100644 index 0d0a4fe12..575d493c9 Binary files a/testsuite/render-mx-medium-vdf-glass/ref/out-linux-alt.exr and b/testsuite/render-mx-medium-vdf-glass/ref/out-linux-alt.exr differ diff --git a/testsuite/render-mx-medium-vdf-glass/ref/out-macos-alt.exr b/testsuite/render-mx-medium-vdf-glass/ref/out-macos-alt.exr deleted file mode 100644 index 27aa0c657..000000000 Binary files a/testsuite/render-mx-medium-vdf-glass/ref/out-macos-alt.exr and /dev/null differ diff --git a/testsuite/render-mx-medium-vdf-glass/ref/out.exr b/testsuite/render-mx-medium-vdf-glass/ref/out.exr old mode 100755 new mode 100644 index 0d0a4fe12..8c1d565f6 Binary files a/testsuite/render-mx-medium-vdf-glass/ref/out.exr and b/testsuite/render-mx-medium-vdf-glass/ref/out.exr differ diff --git a/testsuite/render-mx-medium-vdf-glass/run.py b/testsuite/render-mx-medium-vdf-glass/run.py index a69ad2ca3..53348ddd1 100755 --- a/testsuite/render-mx-medium-vdf-glass/run.py +++ b/testsuite/render-mx-medium-vdf-glass/run.py @@ -6,5 +6,7 @@ failthresh = 0.01 failpercent = 1 +allowfailures = 5 + outputs = [ "out.exr" ] -command = testrender("-r 196 196 -aa 32 scene.xml out.exr") +command = testrender("-r 196 196 -aa 16 scene.xml out.exr") diff --git a/testsuite/render-mx-medium-vdf/ref/out-linux-alt.exr b/testsuite/render-mx-medium-vdf/ref/out-linux-alt.exr old mode 100755 new mode 100644 index 76e80d194..e49c557f8 Binary files a/testsuite/render-mx-medium-vdf/ref/out-linux-alt.exr and b/testsuite/render-mx-medium-vdf/ref/out-linux-alt.exr differ diff --git a/testsuite/render-mx-medium-vdf/ref/out-macos-alt.exr b/testsuite/render-mx-medium-vdf/ref/out-macos-alt.exr deleted file mode 100755 index b11e7da1d..000000000 Binary files a/testsuite/render-mx-medium-vdf/ref/out-macos-alt.exr and /dev/null differ diff --git a/testsuite/render-mx-medium-vdf/ref/out.exr b/testsuite/render-mx-medium-vdf/ref/out.exr old mode 100755 new mode 100644 index 76e80d194..397560eb1 Binary files a/testsuite/render-mx-medium-vdf/ref/out.exr and b/testsuite/render-mx-medium-vdf/ref/out.exr differ diff --git a/testsuite/render-mx-medium-vdf/run.py b/testsuite/render-mx-medium-vdf/run.py index 00fd262d2..99bddf1de 100755 --- a/testsuite/render-mx-medium-vdf/run.py +++ b/testsuite/render-mx-medium-vdf/run.py @@ -6,5 +6,6 @@ failthresh = 0.01 failpercent = 1 + outputs = [ "out.exr" ] -command = testrender("-v -r 196 196 -aa 64 scene.xml out.exr") +command = testrender("-v -r 196 196 -aa 32 scene.xml out.exr")