Changeset 2315 for cobra/trunk/Source/TestifyRunner.cobra

Timestamp:

03/12/10 09:25:11 (2 years ago)

Author:

Chuck.Esterbrook

Message:

An above error about numeric types indicates that you may want to set the default numeric type with "@number [expectedType]" in a source file or "cobra -number:[expectedType]" at the command line.

Files:

• cobra/trunk/Source/TestifyRunner.cobra (modified) (4 diffs)

cobra/trunk/Source/TestifyRunner.cobra

@@ -419 +419 @@
             index = firstLine.indexOf('.warning.')
             warning = firstLine.substring(index+9).trim.toLower
-            return _testifyHeadWarning(warning, compilerVerbosity, fileNames, options, verbose) 
+            return _testifyHeadWarning(warning, false, compilerVerbosity, fileNames, options, verbose) 
+
+        if firstLineInsensitive.startsWith('#.warning-lax.')
+            # deprecated: put warnings on the lines where they occur. the "hasInlineMessages" code above will detect them.
+            index = firstLine.indexOf('.warning-lax.')
+            warning = firstLine.substring(index+13).trim.toLower
+            return _testifyHeadWarning(warning, true, compilerVerbosity, fileNames, options, verbose) 
 
         return _testifyStd(compilerVerbosity, fileNames, options, verbose)
@@ -509 +515 @@
                 return 0
                 
-            if firstLineInsensitive.startsWith('#.error.') or firstLineInsensitive.startsWith('#.warning.')
+            if firstLineInsensitive.startsWith('#.error.') or firstLineInsensitive.startsWith('#.warning.') or firstLineInsensitive.startsWith('#.warning-lax.')
                 # these are handled below
                 break
@@ -639 +645 @@
         return 1
 
-    def _testifyHeadWarning(warning as String, compilerVerbosity as int, fileNames as IList<of String>,
+    def _testifyHeadWarning(warning as String, lax as bool, compilerVerbosity as int, fileNames as IList<of String>,
                             options as OptionValues, verbose as bool) as int 
         # TODO: the following code both checks for warnings to be thrown as well as going through a list of warnings. Seems like it should just need to do one or the other.
@@ -646 +652 @@
             c.testifyFilesNamed(fileNames, options, _resultsWriter to !, verbose)
         catch StopCompilation
-            print 'Expecting warning substring: "[warning]"'
-            print 'But got errors.'
-            .failed
-            return 0
+            if not lax
+                print 'Expecting warning substring: "[warning]"'
+                print 'But got errors.'
+                .failed
+                return 0
         catch exc as Exception
             print 'Internal exception: [exc]'