testing: address review feedback on OpenEXR lj2k/zstd compression tests

Raise the local build OpenEXR default to 3.5.0 in build_OpenEXR.cmake,
matching the version already bumped in the build shell script.

Rename the OIIO_OPENEXR_NEW_COMPRESSION environment variable to
OIIO_OPENEXR_LJ2K_ZSTD_SUPPORT, old env variable would have read oddly
once something else lands in a future OpenEXR release.

The lj2k/zstd env var is now added via
set_property(TEST ... APPEND PROPERTY ENVIRONMENT ...) once
OpenEXR_VERSION >= 3.5.0, after both the base and .core test
variants already exist, rather than being threaded through
ENVIRONMENT arguments on a separate set of oiio_add_tests() calls.

Add testsuite/openexr-compression/ref/out-legacy.txt so the test
still passes on OpenEXR < 3.5.0, where lj2k/zstd aren't compiled in.

Signed-off-by: Abhirup Bhattacharyya <abhirup27022001@outlook.com>

Author: QuantaDude

src/cmake/build_OpenEXR.cmake

@@ -3,7 +3,7 @@
 # https://github.com/AcademySoftwareFoundation/OpenImageIO
 
 
-set_cache (OpenEXR_BUILD_VERSION 3.4.15 "OpenEXR version for local builds")
+set_cache (OpenEXR_BUILD_VERSION 3.5.0 "OpenEXR version for local builds")
 set (OpenEXR_GIT_REPOSITORY "https://github.com/AcademySoftwareFoundation/OpenEXR")
 set (OpenEXR_GIT_TAG "v${OpenEXR_BUILD_VERSION}")
 set (OpenEXR_GIT_COMMIT "e71cdd5d30a146dcb56c5e4c576d9e9d3c45f4fb")

src/cmake/testing.cmake

@@ -4,13 +4,6 @@
 
 include (CTest)
 
-# New compression tests of zstd and lj2k require OpenEXR main branch, or latest release or at least V3.5.0 
-if (OpenEXR_VERSION VERSION_GREATER_EQUAL 3.5)
-    set (_openexr_new_compression "1")
-else ()
-    set (_openexr_new_compression "0")
-endif ()
-
 # Make a build/platform/testsuite directory, and copy the master runtest.py
 # there. The rest is up to the tests themselves.
 file (MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/testsuite")
@@ -449,10 +442,7 @@ macro (oiio_add_all_tests)
     if (OpenEXR_VERSION VERSION_GREATER_EQUAL 3.1.10)
         # OpenEXR 3.1.10 is the first release where the exr core library
         # properly supported all compression types (DWA in particular).
-        
-        # openexr-compression is added separately below so that its
-        # OpenEXR-3.5-specific cases can be selected conditionally.
-        
+        list (APPEND all_openexr_tests openexr-compression)
         # openexr-scanlines reads a DWA-compressed file, so it needs the same
         # minimum as openexr-compression for the core-library test variant.
         if (USE_PYTHON AND NOT SANITIZE)
@@ -471,35 +461,22 @@ macro (oiio_add_all_tests)
                     ENVIRONMENT OPENIMAGEIO_OPTIONS=openexr:core=0 "${_pybind_tests_pythonpath}"
                     IMAGEDIR openexr-images
                     URL http://github.com/AcademySoftwareFoundation/openexr-images)
-
-    if (OpenEXR_VERSION VERSION_GREATER_EQUAL 3.1.10)
-        # For OpenEXR >= 3.5 we need to add the new compression tests
-        oiio_add_tests (openexr-compression
-                        ENVIRONMENT OPENIMAGEIO_OPTIONS=openexr:core=0
-                                    "OIIO_OPENEXR_NEW_COMPRESSION=${_openexr_new_compression}"
-                                    "${_pybind_tests_pythonpath}"
-                        IMAGEDIR openexr-images
-                        URL http://github.com/AcademySoftwareFoundation/openexr-images)
-    endif ()
-    
+    # For OpenEXR >= 3.1, be sure to test with the core option on
     if (OpenEXR_VERSION VERSION_GREATER_EQUAL 3.1)
-        # For OpenEXR >= 3.5 we need to add the new compression tests, with the core library
         oiio_add_tests (${all_openexr_tests}
                         SUFFIX ".core"
                         ENVIRONMENT OPENIMAGEIO_OPTIONS=openexr:core=1 "${_pybind_tests_pythonpath}"
                         IMAGEDIR openexr-images
                         URL http://github.com/AcademySoftwareFoundation/openexr-images)
     endif ()
 
-    # For OpenEXR >= 3.5
-    if (OpenEXR_VERSION VERSION_GREATER_EQUAL 3.1.10)
-        oiio_add_tests (openexr-compression
-                        SUFFIX ".core"
-                        ENVIRONMENT OPENIMAGEIO_OPTIONS=openexr:core=1
-                                    "OIIO_OPENEXR_NEW_COMPRESSION=${_openexr_new_compression}"
-                                    "${_pybind_tests_pythonpath}"
-                        IMAGEDIR openexr-images
-                        URL http://github.com/AcademySoftwareFoundation/openexr-images)
+    # New compression tests of zstd and lj2k require OpenEXR main branch,
+    # or latest release or at least V3.5.0
+    if (OpenEXR_VERSION VERSION_GREATER_EQUAL 3.5.0)
+        set_property (TEST openexr-compression APPEND PROPERTY ENVIRONMENT
+                      "OIIO_OPENEXR_LJ2K_ZSTD_SUPPORT=1")
+        set_property (TEST openexr-compression.core APPEND PROPERTY ENVIRONMENT
+                      "OIIO_OPENEXR_LJ2K_ZSTD_SUPPORT=1")
     endif ()
 
     # Regression test (compiles its own helper and generates its own image)

testsuite/openexr-compression/ref/out-legacy.txt

@@ -0,0 +1,30 @@
+out-none.exr compression none
+out-rle.exr compression rle
+out-zips.exr compression zips
+out-zip.exr compression zip
+out-piz.exr compression piz
+out-pxr24.exr compression pxr24
+out-b44.exr compression b44
+out-b44a.exr compression b44a
+out-dwaa.exr compression dwaa
+out-dwab.exr compression dwab
+Comparing "out-none.exr" and "ref/out-zip.exr"
+PASS
+Comparing "out-rle.exr" and "ref/out-zip.exr"
+PASS
+Comparing "out-zips.exr" and "ref/out-zip.exr"
+PASS
+Comparing "out-zip.exr" and "ref/out-zip.exr"
+PASS
+Comparing "out-piz.exr" and "ref/out-zip.exr"
+PASS
+Comparing "out-pxr24.exr" and "ref/out-zip.exr"
+PASS
+Comparing "out-b44.exr" and "ref/out-b44.exr"
+PASS
+Comparing "out-b44a.exr" and "ref/out-b44.exr"
+PASS
+Comparing "out-dwaa.exr" and "ref/out-dwaa.exr"
+PASS
+Comparing "out-dwab.exr" and "ref/out-dwaa.exr"
+PASS

testsuite/openexr-compression/run.py

@@ -21,7 +21,7 @@
     "dwab",
 ]
 
-if os.getenv("OIIO_OPENEXR_NEW_COMPRESSION") == "1":
+if os.getenv("OIIO_OPENEXR_LJ2K_ZSTD_SUPPORT") == "1":
     compressions += ["lj2k", "zstd"]
 
 anymatch = True