From 591526d5f96e1e240f18544fef0cda02c8577bc8 Mon Sep 17 00:00:00 2001
From: Larry Gritz <lg@larrygritz.com>
Date: Wed, 29 Jul 2026 14:50:22 -0700
Subject: [PATCH] testing: reduce cpp test cost

The rendering tests that are using the cpp debugging output are even
more expensive then those without, and are also more serialized (both
due to the fact that they have to shell out to invoke the C++
compiler).

Bump up their "cost" and reduce their core allocation (i.e. let other
tests be more inclined to parallelize against them) in the hopes of
speeding up testing, especially on the CI runners.

Also I noticed that the "render-*.cpp" tests were running their
"unoptimized" variants (in addition to opt), whereas the regular
render-* tests only run the optimized version. So fix so that we don't
need to run the render-*.cpp unoptimized tests, saving more time.

Signed-off-by: Larry Gritz <lg@larrygritz.com>
---
 src/cmake/testing.cmake | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/cmake/testing.cmake b/src/cmake/testing.cmake
index 0b0477f56..db23a9da2 100644
--- a/src/cmake/testing.cmake
+++ b/src/cmake/testing.cmake
@@ -68,22 +68,32 @@ macro (add_one_testsuite testname testsrcdir)
     add_test ( NAME ${testname} COMMAND ${_tst_COMMAND} )
     # message ("Test -- env ${_tst_ENV} cmd ${_tst_COMMAND}")
     set_tests_properties (${testname} PROPERTIES ENVIRONMENT "${_tst_ENV}" )
-    # Certain tests are already internally multi-threaded, so to keep them
-    # from piling up together, allocate a few cores each.
+
+    # Certain tests get special labels and other properties
     if (${testname} MATCHES "^render-")
+        # Render tests are expensive and quite well internally multithreaded,
+        # so give them long timeouts, high costs, and reserve procs.
         set_tests_properties (${testname} PROPERTIES LABELS render
-                              PROCESSORS 4 COST 10 TIMEOUT ${OSL_TEST_BIG_TIMEOUT})
-    endif ()
-    # For debug builds, render tests are very slow, so give them a longer timeout
-    if (${testname} MATCHES "render-" AND ${CMAKE_BUILD_TYPE} STREQUAL Debug)
-        set_tests_properties (${testname} PROPERTIES TIMEOUT ${OSL_TEST_BIG_TIMEOUT})
+                              PROCESSORS 4 COST 10
+                              TIMEOUT ${OSL_TEST_BIG_TIMEOUT})
+        if (${testname} MATCHES "cpp")
+            # Render tests doing full C++ compiles are even more expensive,
+            # and cut back their procs because the compilation by external
+            # cpp is quite expensive but can't be internally parallized.
+            set_tests_properties (${testname} PROPERTIES
+                                  PROCESSORS 2 COST 20)
+        endif ()
     endif ()
     # Some labeling for fun
     if (${testname} MATCHES "^texture")
+        # Texture tests are internally multithreaded, so give them 2 cores,
+        # and they are medium expensive.
         set_tests_properties (${testname} PROPERTIES LABELS texture
                               PROCESSORS 2 COST 4)
     endif ()
     if (${testname} MATCHES "noise")
+        # Noise tests are internally multithreaded, so give them 2 cores,
+        # and they are medium expensive.
         set_tests_properties (${testname} PROPERTIES LABELS noise
                               PROCESSORS 2 COST 4)
     endif ()
@@ -296,7 +306,8 @@ macro ( TESTSUITE )
                 set (_cpp_eligible ON)
             endif ()
         endif ()
-        if (_cpp_eligible AND NOT EXISTS "${_testsrcdir}/OPTIMIZEONLY")
+        if (_cpp_eligible AND NOT _testname MATCHES "render"
+            AND NOT EXISTS "${_testsrcdir}/OPTIMIZEONLY")
             add_one_testsuite ("${_testname}.cpp" "${_testsrcdir}"
                                 ENV TESTSHADE_OPT=0 OSL_DEBUG_OUTPUT_CPP=3 )
         endif ()