test158

Signed-off-by: Cary Phillips <cary@ilm.com>

Author: cary-ilm

.github/workflows/ci_workflow.yml

@@ -40,7 +40,6 @@ permissions:
 
 jobs:
   linux:
-    if: false
     name: 'Linux.${{ matrix.build}}: ${{ matrix.label }}'
     uses: ./.github/workflows/ci_steps.yml
     with:
@@ -99,7 +98,6 @@ jobs:
             vfx-cy: 2023
 
   macOS:
-    if: false
     name: 'macOS.${{ matrix.build}}: ${{ matrix.label }}'
     uses: ./.github/workflows/ci_steps.yml
     with:
@@ -162,44 +160,45 @@ jobs:
     strategy:
       matrix:
         include:
-#          - build: 1
-#            label: Release
+          - build: 1
+            label: Release
 
           - build: 2
             label: Debug
             build-type: Debug
+            if: false # TODO: build fails
 
-#          - build: 3
-#            label: static
-#            BUILD_SHARED_LIBS: 'OFF'
-#
-#          - build: 4
-#            label: pkgconfig=OFF, testing=OFF
-#            IMATH_INSTALL_PKG_CONFIG: 'OFF'
-#            BUILD_TESTING: 'OFF'
-#            python: 'OFF'
-#            pybind11: 'OFF'
-#
-#          - build: 5
-#            label: vfx2022
-#            os: windows-2019
-#
-#          - build: 6
-#            label: msys2-mingw32
-#            msystem: MINGW32
-#            BUILD_TESTING: 'OFF'
-#            
-#          - build: 7
-#            label: msys2-mingw32, static
-#            msystem: MINGW32
-#            BUILD_SHARED_LIBS: 'OFF'
-#            BUILD_TESTING: 'OFF'
-#
-#          - build: 8
-#            label: msys2-ucrt64
-#            msystem: UCRT64
-#
-#          - build: 9
-#            label: msys2-ucrt64, static
-#            msystem: UCRT64
-#            BUILD_SHARED_LIBS: 'OFF'
+          - build: 3
+            label: static
+            BUILD_SHARED_LIBS: 'OFF'
+
+          - build: 4
+            label: pkgconfig=OFF, testing=OFF
+            IMATH_INSTALL_PKG_CONFIG: 'OFF'
+            BUILD_TESTING: 'OFF'
+            python: 'OFF'
+            pybind11: 'OFF'
+
+          - build: 5
+            label: vfx2022
+            os: windows-2019
+
+          - build: 6
+            label: msys2-mingw32
+            msystem: MINGW32
+            # BUILD_TESTING: 'OFF'
+            
+          - build: 7
+            label: msys2-mingw32, static
+            msystem: MINGW32
+            BUILD_SHARED_LIBS: 'OFF'
+            # BUILD_TESTING: 'OFF'
+
+          - build: 8
+            label: msys2-ucrt64
+            msystem: UCRT64
+
+          - build: 9
+            label: msys2-ucrt64, static
+            msystem: UCRT64
+            BUILD_SHARED_LIBS: 'OFF'

src/python/CMakeLists.txt

@@ -38,5 +38,5 @@ if(BUILD_TESTING)
   add_subdirectory( PyImathPythonTest )
   add_subdirectory( PyImathTest )
   add_subdirectory( PyImathSpeedTest )
-#  add_subdirectory( PyImathNumpyTest )
+  add_subdirectory( PyImathNumpyTest )
 endif()

src/python/PyImathNumpyTest/CMakeLists.txt

@@ -1,11 +1,11 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright Contributors to the OpenEXR Project.
 
-add_test(PyImath.PyImathNumpyTest_Python3
+add_test(PyImath.PyImathNumpyTest
   ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/pyImathNumpyTest.in
 )
 
-set_tests_properties(PyImath.PyImathNumpyTest_Python3 PROPERTIES
+set_tests_properties(PyImath.PyImathNumpyTest PROPERTIES
   ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/python${Python3_VERSION_MAJOR}_${Python3_VERSION_MINOR}"
 )
 

src/python/PyImathTest/CMakeLists.txt

@@ -25,13 +25,13 @@ else()
 
   add_executable(PyImathTestC ${PYIMATH_TEST_SOURCES})
 
-  add_test(PyImath.PyImathTest_Python3
+  add_test(PyImath.PyImathTest
     ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/pyImathTest.in
   )
 
   message (STATUS "PYTHONPATH=${CMAKE_BINARY_DIR}/python${Python3_VERSION_MAJOR}_${Python3_VERSION_MINOR}")
 
-  set_tests_properties(PyImath.PyImathTest_Python3 PROPERTIES
+  set_tests_properties(PyImath.PyImathTest PROPERTIES
     ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/python${Python3_VERSION_MAJOR}_${Python3_VERSION_MINOR}"
   )