AcademySoftwareFoundation · lgritz · Nov 20, 2021 · Nov 17, 2021
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -179,6 +179,7 @@ jobs:
       CXX: g++
       CC: gcc
       CMAKE_CXX_STANDARD: 17
+      OPENIMAGEIO_VERSION: release
       PYBIND11_VERSION: v2.7.1
       PYTHON_VERSION: 3.9
       USE_BATCHED: b8_AVX2
@@ -203,6 +204,7 @@ jobs:
             src/build-scripts/ci-startup.bash
       - name: Dependencies
         run: |
+            rm -rf /usr/local/include/OpenImageIO /usr/local/lib/cmake/OpenImageIO
             src/build-scripts/gh-installdeps.bash
       - name: Build
         run: |

diff --git a/src/cmake/testing.cmake b/src/cmake/testing.cmake
@@ -304,11 +304,11 @@ macro (osl_add_all_tests)
         TESTSUITE ( python-oslquery )
     endif ()
 
-    # Only run field3d-related tests if the local OIIO was built with f3d support.
-    execute_process ( COMMAND ${OPENIMAGEIO_BIN} --help
+    # Only run openvdb-related tests if the local OIIO has openvdb support.
+    execute_process ( COMMAND ${OpenImageIO_LIB_DIR}/../bin/oiiotool --help
                       OUTPUT_VARIABLE oiiotool_help )
-    if (oiiotool_help MATCHES "field3d")
-        TESTSUITE ( texture-field3d )
+    if (oiiotool_help MATCHES "openvdb")
+        TESTSUITE ( texture3d )
     endif()
 
     # Only run pointcloud tests if Partio is found

diff --git a/testsuite/texture-field3d/dense_float.f3d b/testsuite/texture-field3d/dense_float.f3d
diff --git a/testsuite/texture-field3d/dense_half.f3d b/testsuite/texture-field3d/dense_half.f3d
diff --git a/testsuite/texture-field3d/ref/out.tif b/testsuite/texture-field3d/ref/out.tif
diff --git a/testsuite/texture-field3d/sparse_float.f3d b/testsuite/texture-field3d/sparse_float.f3d
diff --git a/testsuite/texture-field3d/sparse_half.f3d b/testsuite/texture-field3d/sparse_half.f3d
diff --git a/testsuite/texture3d/ref/out.tif b/testsuite/texture3d/ref/out.tif
diff --git a/testsuite/texture-field3d/ref/out.txt → testsuite/texture3d/ref/out.txt b/testsuite/texture-field3d/ref/out.txt → testsuite/texture3d/ref/out.txt
diff --git a/testsuite/texture-field3d/run.py → testsuite/texture3d/run.py b/testsuite/texture-field3d/run.py → testsuite/texture3d/run.py
diff --git a/testsuite/texture3d/sphere.vdb b/testsuite/texture3d/sphere.vdb
diff --git a/testsuite/texture-field3d/test.osl → testsuite/texture3d/test.osl b/testsuite/texture-field3d/test.osl → testsuite/texture3d/test.osl
@@ -3,8 +3,8 @@
 // https://github.com/AcademySoftwareFoundation/OpenShadingLanguage
 
 shader
-test (string filename = "data/sparse_half.f3d",
+test (string filename = "data/sphere.vdb",
       output color Cout = 0)
 {
-    Cout = (color) texture3d (filename, point(u,v,0.5));
+    Cout = (color) texture3d (filename, point(u*2-1,v*2-1,0));
 }