fix: unbreak osl-unittest.h for OptiX (#1926)

Ugh, I broke the testsuite under OptiX a while back and it took me a while to notice. When I added new unit tests for color[24] and vector[24], I used the format() call, and that's not supported in OptiX mode. But printf is, so in this patch, I fix it all up and now the tests pass in OptiX. Signed-off-by: Larry Gritz <[email protected]>
AcademySoftwareFoundation · Jan 21, 2025 · edcd505 · edcd505
1 parent 4176a6f
commit edcd505
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 20 deletions.
diff --git a/testsuite/color4/test.osl b/testsuite/color4/test.osl
@@ -42,8 +42,8 @@ test (color4 param1 = color4 ({0.5, 1.5, 2.5}, 3.5),
       color4 param2 = color4 ({10.0, 20.0, 30.0}, 40.0)
      )
 {
-    printf("parameter initialization: param1 = %s\n", tostring(param1));
-    printf("parameter initialization: param2 = %s\n", tostring(param2));
+    printf("parameter initialization: param1 = %g %g\n", param1.rgb, param1.a);
+    printf("parameter initialization: param2 = %g %g\n", param2.rgb, param2.a);
     printf("\n");
 
     OSL_CHECK_EQUAL(param1, mkcolor4(0.5, 1.5, 2.5, 3.5));

diff --git a/testsuite/common/shaders/osl-unittest.h b/testsuite/common/shaders/osl-unittest.h
@@ -23,37 +23,61 @@
 #endif
 
 
-string tostring(int x) { return format("%d", x); }
-string tostring(float x) { return format("%g", x); }
-string tostring(color x) { return format("%g", x); }
-string tostring(point x) { return format("%g", x); }
-string tostring(vector x) { return format("%g", x); }
-string tostring(normal x) { return format("%g", x); }
-string tostring(string x) { return x; }
+
+void failmsg(string file, int line, string xs, int x, string ys, int y)
+{
+    printf("\nFAIL: %s:%d: %s (%d) == %s (%d)\n\n", file, line, xs, x, ys, y);
+}
+
+void failmsg(string file, int line, string xs, float x, string ys, float y)
+{
+    printf("\nFAIL: %s:%d: %s (%g) == %s (%g)\n\n", file, line, xs, x, ys, y);
+}
+
+void failmsg(string file, int line, string xs, color x, string ys, color y)
+{
+    printf("\nFAIL: %s:%d: %s (%g) == %s (%g)\n\n", file, line, xs, x, ys, y);
+}
+
+void failmsg(string file, int line, string xs, vector x, string ys, vector y)
+{
+    printf("\nFAIL: %s:%d: %s (%g) == %s (%g)\n\n", file, line, xs, x, ys, y);
+}
 
 #ifdef COLOR2_H
-string tostring(color2 x) { return format("%g %g", x.r, x.a); }
+void failmsg(string file, int line, string xs, color2 x, string ys, color2 y)
+{
+    printf("\nFAIL: %s:%d: %s (%g %g) == %s (%g %g)\n\n",
+           file, line, xs, x.r, x.a, ys, y.r, y.a);
+}
 #endif
 
 #ifdef COLOR4_H
-string tostring(color4 x)
+void failmsg(string file, int line, string xs, color4 x, string ys, color4 y)
 {
-    return format("%g %g %g %g", x.rgb.r, x.rgb.g, x.rgb.b, x.a);
+    printf("\nFAIL: %s:%d: %s (%g %g) == %s (%g %g)\n\n",
+           file, line, xs, x.rgb, x.a, ys, y.rgb, y.a);
 }
 #endif
 
 #ifdef VECTOR2_H
-string tostring(vector2 x) { return format("%g %g", x.x, x.y); }
+void failmsg(string file, int line, string xs, vector2 x, string ys, vector2 y)
+{
+    printf("\nFAIL: %s:%d: %s (%g %g) == %s (%g %g)\n\n",
+           file, line, xs, x.x, x.y, ys, y.x, y.y);
+}
 #endif
 
 #ifdef VECTOR4_H
-string tostring(vector4 x)
+void failmsg(string file, int line, string xs, vector4 x, string ys, vector4 y)
 {
-    return format("%g %g %g %g", x.x, x.y, x.z, x.w);
+    printf("\nFAIL: %s:%d: %s (%g %g %g %g) == %s (%g %g %g %g)\n\n",
+           file, line, xs, x.x, x.y, x.z, x.w, ys, y.x, y.y, y.z, y.w);
 }
 #endif
 
 
+
 // Macros to test conditions in shaders.
 //
 // A success by default will just silently move on, but if the symbol
@@ -80,15 +104,14 @@ string tostring(vector4 x)
 
 
 // Check that two expressions are equal. For non-built-in types, this
-// requires that a tostring() function is defined for that type.
+// requires that a failmsg() function is defined for that type.
 #define OSL_CHECK_EQUAL(x,y)                                                \
     do {                                                                    \
         if ((x) == (y)) {                                                   \
             if (OSL_UNITTEST_VERBOSE)                                       \
                 printf("PASS: %s == %s\n", #x, #y);                         \
         } else {                                                            \
-            printf("\nFAIL: %s:%d: %s (%s) == %s (%s)\n\n",                 \
-                   __FILE__, __LINE__, #x, tostring(x), #y, tostring(y));   \
+            failmsg(__FILE__, __LINE__, #x, x, #y, y);                      \
             if (OSL_UNITTEST_EXIT_ON_FAILURE)                               \
                 exit();                                                     \
         }                                                                   \

diff --git a/testsuite/vector4/test.osl b/testsuite/vector4/test.osl
@@ -37,8 +37,10 @@ test (vector4 param1 = vector4 (0.5, 1.5, 2.5, 3.5),
       vector4 param2 = vector4 (10.0, 20.0, 30.0, 40.0)
      )
 {
-    printf("parameter initialization: param1 = %s\n", tostring(param1));
-    printf("parameter initialization: param2 = %s\n", tostring(param2));
+    printf("parameter initialization: param1 = %g %g %g %g\n",
+           param1.x, param1.y, param1.z, param1.w);
+    printf("parameter initialization: param2 = %g %g %g %g\n",
+           param2.x, param2.y, param2.z, param2.w);
     printf("\n");
 
     OSL_CHECK_EQUAL(param1, vector4(0.5, 1.5, 2.5, 3.5));