Merge branch 'main' into Add-llvm-21-support

Author: mcbarton

.github/actions/Build_and_Test_cppyy/action.yml

@@ -78,7 +78,7 @@ runs:
         python -m pip install --upgrade pip
         python -m pip install pytest
         python -m pip install pytest-xdist
-        python -m pip install numba
+        python -m pip install numba==0.61.2
         echo ::endgroup::
         echo ::group::Run complete test suite
         set -o pipefail

.github/workflows/main.yml

@@ -158,40 +158,40 @@ jobs:
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
           # MacOS X86 Jobs
-          - name: osx13-x86-clang-clang-repl-21
-            os: macos-13
+          - name: osx15-x86-clang-clang-repl-21
+            os: macos-15-intel
             compiler: clang
             clang-runtime: '21'
             cling: Off
             cppyy: Off
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host"
-          - name: osx13-x86-clang-clang-repl-20
-            os: macos-13
+          - name: osx15-x86-clang-clang-repl-20
+            os: macos-15-intel
             compiler: clang
             clang-runtime: '20'
             cling: Off
             cppyy: Off
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host"
-          - name: osx13-x86-clang-clang-repl-19-cppyy
-            os: macos-13
+          - name: osx15-x86-clang-clang-repl-19-cppyy
+            os: macos-15-intel
             compiler: clang
             clang-runtime: '19'
             cling: Off
             cppyy: On
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host"
-          - name: osx13-x86-clang-clang-repl-18-cppyy
-            os: macos-13
+          - name: osx15-x86-clang-clang-repl-18-cppyy
+            os: macos-15-intel
             compiler: clang
             clang-runtime: '18'
             cling: Off
             cppyy: On
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host"
-          - name: osx13-x86-clang-clang18-cling-cppyy
-            os: macos-13
+          - name: osx15-x86-clang-clang18-cling-cppyy
+            os: macos-15-intel
             compiler: clang
             clang-runtime: '18'
             cling: On
@@ -335,3 +335,4 @@ jobs:
       uses: mxschmitt/action-tmate@v3
       # When debugging increase to a suitable value!
       timeout-minutes: 30
+

unittests/CppInterOp/FunctionReflectionTest.cpp

@@ -2681,17 +2681,18 @@ TEST(FunctionReflectionTest, DestructArray) {
   output.clear();
 
   // deallocate since we call the destructor withFree = false
-  Cpp::Deallocate(scope, where, 5);
+  Cpp::Deallocate(scope, where, a);
 
   // perform the same withFree=true
-  where = Cpp::Allocate(scope, a);
-  EXPECT_TRUE(where == Cpp::Construct(scope, where, a));
+  where = nullptr;
+  where = Cpp::Construct(scope, nullptr, a);
+  EXPECT_TRUE(where);
   testing::internal::CaptureStdout();
-  // FIXME : This should work with the array of objects as well
-  // Cpp::Destruct(where, scope, true, 5);
-  EXPECT_TRUE(Cpp::Destruct(where, scope, true));
+  EXPECT_TRUE(Cpp::Destruct(where, scope, true, a));
   output = testing::internal::GetCapturedStdout();
-  EXPECT_EQ(output, "\nDestructor Executed\n");
+  EXPECT_EQ(output,
+            "\nDestructor Executed\n\nDestructor Executed\n\nDestructor "
+            "Executed\n\nDestructor Executed\n\nDestructor Executed\n");
   output.clear();
 }
 
@@ -2725,9 +2726,6 @@ TEST(FunctionReflectionTest, UndoTest) {
 TEST(FunctionReflectionTest, FailingTest1) {
 #ifdef _WIN32
   GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
-#endif
-#ifdef EMSCRIPTEN_SHARED_LIBRARY
-  GTEST_SKIP() << "Test fails for Emscipten shared library builds";
 #endif
   Cpp::CreateInterpreter();
   EXPECT_FALSE(Cpp::Declare(R"(

unittests/CppInterOp/InterpreterTest.cpp

@@ -379,6 +379,7 @@ TEST(InterpreterTest, MultipleInterpreter) {
 #ifdef _WIN32
   GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
 #endif
+  GTEST_SKIP() << "Test does not consistently pass so skipping for now";
   // delete all old interpreters
   while (Cpp::DeleteInterpreter())
     ;