oslc -Werror (#862)

This flag to oslc will treat all warnings issued as if they were errors.

Author: lgritz

CMakeLists.txt

@@ -310,7 +310,7 @@ TESTSUITE ( aastep allowconnect-err and-or-not-synonyms
             vararray-connect vararray-default
             vararray-deserialize vararray-param
             vecctr vector
-            wavelength_color xml )
+            wavelength_color Werror xml )
 
 # Only run field3d-related tests if the local OIIO was built with f3d support.
 EXECUTE_PROCESS ( COMMAND ${OPENIMAGEIO_BIN}/oiiotool --help

src/liboslcomp/oslcomp.cpp

@@ -129,7 +129,7 @@ OSLCompilerImpl::OSLCompilerImpl (ErrorHandler *errhandler)
       m_err(false), m_symtab(*this),
       m_current_typespec(TypeDesc::UNKNOWN), m_current_output(false),
       m_verbose(false), m_quiet(false), m_debug(false),
-      m_preprocess_only(false), m_optimizelevel(1),
+      m_preprocess_only(false), m_err_on_warning(false), m_optimizelevel(1),
       m_next_temp(0), m_next_const(0),
       m_osofile(NULL),
       m_total_nesting(0), m_loop_nesting(0), m_derivsym(NULL),
@@ -409,6 +409,8 @@ OSLCompilerImpl::read_compile_options (const std::vector<std::string> &options,
             m_optimizelevel = 1;
         } else if (options[i] == "-O2") {
             m_optimizelevel = 2;
+        } else if (options[i] == "-Werror") {
+            m_err_on_warning = true;
         } else if (options[i].c_str()[0] == '-' && options[i].size() > 2) {
             // options meant for the preprocessor
             if (options[i].c_str()[1] == 'D' || options[i].c_str()[1] == 'U')

src/liboslcomp/oslcomp_pvt.h

@@ -119,6 +119,10 @@ class OSLCompilerImpl {
     {
         ASSERT (format.size());
         std::string msg = OIIO::Strutil::format (format, args...);
+        if (m_err_on_warning) {
+            error (filename, line, "%s", msg);
+            return;
+        }
         if (filename.size())
             m_errhandler->warning ("%s:%d: warning: %s", filename, line, msg);
         else
@@ -447,6 +451,7 @@ class OSLCompilerImpl {
     bool m_quiet;             ///< Quiet mode
     bool m_debug;             ///< Debug mode
     bool m_preprocess_only;   ///< Preprocess only?
+    bool m_err_on_warning;    ///< Treat warnings as errors?
     int m_optimizelevel;      ///< Optimization level
     OpcodeVec m_ircode;       ///< Generated IR code
     SymbolPtrVec m_opargs;    ///< Arguments for all instructions

src/oslc/oslcmain.cpp

@@ -108,7 +108,6 @@ static OSLC_ErrorHandler default_oslc_error_handler;
 
 
 
-
 int
 main (int argc, const char *argv[])
 {
@@ -139,7 +138,9 @@ main (int argc, const char *argv[])
                  ! strcmp (argv[a], "-d") ||
                  ! strcmp (argv[a], "-E") ||
                  ! strcmp (argv[a], "-O") || ! strcmp (argv[a], "-O0") ||
-                 ! strcmp (argv[a], "-O1") || ! strcmp (argv[a], "-O2")) {
+                 ! strcmp (argv[a], "-O1") || ! strcmp (argv[a], "-O2") ||
+                 ! strcmp (argv[a], "-Werror")
+                 ) {
             // Valid command-line argument
             args.emplace_back(argv[a]);
             quiet |= (strcmp (argv[a], "-q") == 0);

testsuite/Werror/ref/out.txt

@@ -0,0 +1,6 @@
+test.osl:8: error: Ambiguous call to 'func ()'
+  Chosen function is:
+    test.osl:4	vector func ()
+  Other candidates are:
+    test.osl:3	normal func ()
+FAILED test.osl

testsuite/Werror/run.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+# This shader would ordinarily issue a warning.
+# With -Werror, it should be upgraded to an error.
+
+failureok = 1     # this test is expected to have oslc errors
+oslcargs = "-Werror"
+
+# No need, the shader in this dir are always compiled
+#command = oslc("test.osl")
+

testsuite/Werror/test.osl

@@ -0,0 +1,9 @@
+// Engineer an ambiguous case that should be a warning
+
+normal func () { return 1; }
+vector func () { return 2; }
+
+shader test ()
+{
+    point p = func();
+}

testsuite/runtest.py

@@ -51,6 +51,7 @@
 failthresh = 0.004
 hardfail = 0.01
 failpercent = 0.02
+oslcargs = ""
 
 image_extensions = [ ".tif", ".tx", ".exr", ".jpg", ".png", ".rla",
                      ".dpx", ".iff", ".psd" ]
@@ -144,7 +145,7 @@ def oiio_app (app):
 # Construct a command that will compile the shader file, appending output to
 # the file "out.txt".
 def oslc (args) :
-    return (osl_app("oslc") + args + " >> out.txt 2>&1 ;\n")
+    return (osl_app("oslc") + oslcargs + " " + args + " >> out.txt 2>&1 ;\n")
 
 
 # Construct a command that will run oslinfo, appending output to