Debug platform latest

Signed-off-by: Rémi Achard <remiachard@gmail.com>
remia · Sep 24, 2024 · eb1d2b3 · eb1d2b3
1 parent 62d3557
commit eb1d2b3
Show file tree

Hide file tree

Showing 25 changed files with 1,405 additions and 1,548 deletions.
diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
diff --git a/.github/workflows/platform_latest.yml b/.github/workflows/platform_latest.yml
@@ -33,11 +33,11 @@ jobs:
        shared=${{ matrix.build-shared }}, 
        cxx=${{ matrix.cxx-standard }}>'
     # Don't run on OCIO forks
-    if: github.repository == 'AcademySoftwareFoundation/OpenColorIO'
+    # if: github.repository == 'AcademySoftwareFoundation/OpenColorIO'
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        build: [1, 2]
+        build: [1, 2, 3, 4]
         include:
           # -------------------------------------------------------------------
           # GCC
@@ -65,24 +65,24 @@ jobs:
           # -------------------------------------------------------------------
           # TODO: Re-enable clang when the following issue get fixed:
           # https://github.com/actions/runner-images/issues/8659
-          # - build: 3
-          #   build-python: ON
-          #   build-type: Release
-          #   build-shared: ON
-          #   cxx-standard: 23
-          #   cxx-compiler: clang++
-          #   cc-compiler: clang
-          #   compiler-desc: Clang
-          #   enable-sanitizer: OFF
-          # - build: 4
-          #   build-python: OFF
-          #   build-type: Debug
-          #   build-shared: ON
-          #   cxx-standard: 23
-          #   cxx-compiler: clang++
-          #   cc-compiler: clang
-          #   compiler-desc: Clang
-          #   enable-sanitizer: ON
+          - build: 3
+            build-python: ON
+            build-type: Release
+            build-shared: ON
+            cxx-standard: 23
+            cxx-compiler: clang++
+            cc-compiler: clang
+            compiler-desc: Clang
+            enable-sanitizer: OFF
+          - build: 4
+            build-python: OFF
+            build-type: Debug
+            build-shared: ON
+            cxx-standard: 23
+            cxx-compiler: clang++
+            cc-compiler: clang
+            compiler-desc: Clang
+            enable-sanitizer: ON
     env:
       CXX: ${{ matrix.cxx-compiler }}
       CC: ${{ matrix.cc-compiler }}
@@ -177,7 +177,7 @@ jobs:
        cxx=${{ matrix.cxx-standard }}, 
        python=${{ matrix.python-version }}>'
     # Don't run on OCIO forks
-    if: github.repository == 'AcademySoftwareFoundation/OpenColorIO'
+    # if: github.repository == 'AcademySoftwareFoundation/OpenColorIO'
     runs-on: macos-latest
     strategy:
       matrix:
@@ -290,7 +290,7 @@ jobs:
        cxx=${{ matrix.cxx-standard }}, 
        python=${{ matrix.python-version }}>'
     # Don't run on OCIO forks
-    if: github.repository == 'AcademySoftwareFoundation/OpenColorIO'
+    # if: github.repository == 'AcademySoftwareFoundation/OpenColorIO'
     runs-on: windows-latest
     strategy:
       matrix:
@@ -353,6 +353,8 @@ jobs:
       - name: Test
         run: ctest -V -C ${{ matrix.build-type }}
         shell: bash
+        env:
+          OCIO_PYTHON_LOAD_DLLS_FROM_PATH: "0"
         working-directory: _build
       - name: Test CMake Consumer with shared OCIO
         if: matrix.build-shared == 'ON'

diff --git a/share/ci/scripts/windows/install_tests_env.sh b/share/ci/scripts/windows/install_tests_env.sh
@@ -7,3 +7,4 @@ set -ex
 HERE=$(dirname $0)
 
 pip install -r $HERE/../../../../tests/python/requirements.txt
+pip install dlltracer
diff --git a/src/bindings/python/package/__init__.py b/src/bindings/python/package/__init__.py
@@ -29,10 +29,27 @@
 # environment variable to 0.
 #
 
+all_dirs = list(os.getenv("PATH", "").split(os.pathsep))
+total_len = len(all_dirs)
+print("Length", total_len)
+print(all_dirs)
+
+mid_pos = int(total_len/2)
+test_dirs = all_dirs[:mid_pos]
+# 23 ok / 24 nok
+# 35 ok /
+test_dirs += all_dirs[mid_pos:mid_pos+36]
+print("Adding only", test_dirs)
+
+print(os.listdir('C:\\Program Files\\Microsoft Service Fabric\\bin\\Fabric\\Fabric.Code'))
+print(os.listdir('C:\\Program Files\\LLVM\\bin'))
+
 if sys.version_info >= (3, 8) and platform.system() == "Windows":
     if os.getenv("OCIO_PYTHON_LOAD_DLLS_FROM_PATH", "1") == "1":
-        for path in os.getenv("PATH", "").split(os.pathsep):
+        for path in all_dirs:
             if os.path.exists(path) and path != ".":
+                # if "LLVM" not in path and "Fabric.Code" not in path:
+                print("Add", path, "to DLL Directories")
                 os.add_dll_directory(path)
 
 del os, sys, platform

diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
@@ -7,4 +7,4 @@ if (MSVC_IDE)
     set(BUILD_TYPE ${CMAKE_BUILD_TYPE})
 endif()
 
-add_test(test_python ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OpenColorIOTestSuite.py ${PROJECT_BINARY_DIR} ${BUILD_TYPE})
+add_test(test_python ${Python_EXECUTABLE} -u ${CMAKE_CURRENT_SOURCE_DIR}/OpenColorIOTestSuite.py ${PROJECT_BINARY_DIR} ${BUILD_TYPE})
diff --git a/tests/python/OpenColorIOTestSuite.py b/tests/python/OpenColorIOTestSuite.py
@@ -5,6 +5,7 @@
 import unittest
 import os
 import sys
+import dlltracer
 
 logging.basicConfig(
     level=logging.INFO,
@@ -38,7 +39,8 @@
     os.environ["TEST_DATAFILES_DIR"] = os.path.join(os.path.dirname(here), 'data', 'files')
     sys.path.insert(0, here)
 
-import PyOpenColorIO as OCIO
+with dlltracer.Trace(out=sys.stdout):
+    import PyOpenColorIO as OCIO
 
 import AllocationTransformTest
 import BakerTest

diff --git a/vendor/openfx/Support/LICENSE b/vendor/openfx/Support/LICENSE
@@ -1,31 +1,32 @@
 Software License :
 
-Copyright (c) 2004-2007, The Open Effects Association Ltd. All rights reserved.
+Copyright OpenFX and contributors to the OpenFX project.
+SPDX-License-Identifier: BSD-3-Clause
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+modification, are permitted provided that the following conditions are
+met:
 
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name The Open Effects Association Ltd, nor the names of its 
-      contributors may be used to endorse or promote products derived from this
-      software without specific prior written permission.
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the
+   distribution.
 
-The Open Effects Association Ltd
-1 Wardour St
-London W1D 6PA
-England
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/openfx/Support/Library/ofxsCore.cpp b/vendor/openfx/Support/Library/ofxsCore.cpp
@@ -1,38 +1,5 @@
-/*
-OFX Support Library, a library that skins the OFX plug-in API with C++ classes.
-Copyright (C) 2004-2005 The Open Effects Association Ltd
-Author Bruno Nicoletti bruno@thefoundry.co.uk
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-* Neither the name The Open Effects Association Ltd, nor the names of its 
-contributors may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-The Open Effects Association Ltd
-1 Wardour St
-London W1D 6PA
-England
-
-
-*/
+// Copyright OpenFX and contributors to the OpenFX project.
+// SPDX-License-Identifier: BSD-3-Clause
 #include "ofxsSupportPrivate.h"
 #ifdef DEBUG
 #include <iostream>
@@ -133,7 +100,7 @@ namespace OFX {
     }
 
     /** @brief free n previously allocated memory */
-    void free(void *ptr) noexcept
+    void free(void *ptr) throw()
     {
       if(ptr)
         // note we are ignore errors, this could be bad, but we don't throw on a destruction
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@ set -ex
		HERE=$(dirname $0)

		pip install -r $HERE/../../../../tests/python/requirements.txt
		pip install dlltracer