[Bug 18463] Make compiler test runner allow chars to be converted to spaces

peter-b · peter-b · commit 93bd81a87ca7 · 2016-09-21T07:51:33.000+01:00
When checking that a compiler error message contains the correct line
of source code, allow any of the original characters to be converted
to spaces.
diff --git a/tests/_compilertestrunner.livecodescript b/tests/_compilertestrunner.livecodescript
@@ -352,7 +352,7 @@ private function doesCompilerOutputSatisfyAssertion pCompilerOutput, pCompilerEx
    put "search" into tState
    repeat for each line tOutputLine in pCompilerOutput
       local tFile, tLine, tColumn, tType, tMessage
-      local tSourceLine, tMarker
+      local tSourceLine, tCharOffset, tOutputChar, tMarker
 
       if tState is "search" then
          -- The format of each output line is:
@@ -383,13 +383,21 @@ private function doesCompilerOutputSatisfyAssertion pCompilerOutput, pCompilerEx
 
       else if tState is "source line" then
          -- The format of the source line output is a space followed
-         -- by the corresponding line of the input source file.
-
-         put " " & line tLine of pTestInfo["code"] into tSourceLine
+         -- by the corresponding line of the input source file.  The
+         -- compiler may replace any of the source characters with
+         -- spaces (for example, to remove control characters).
+
+        put " " & line tLine of pTestInfo["code"] into tSourceLine
+
+        repeat with tCharOffset = 1 to the number of chars in tOutputLine
+           put char tCharOffset of tOutputLine into tOutputChar
+           if tOutputChar is not " " and \
+                 tOutputChar is not char tCharOffset of tSourceLine then
+              return false
+           end if
+         end repeat
 
-         if tOutputLine is tSourceLine then
-            put "marker" into tState
-         end if
+         put "marker" into tState
 
       else if tState is "marker" then
          -- The marker should point at the correct column within the
@@ -402,6 +410,8 @@ private function doesCompilerOutputSatisfyAssertion pCompilerOutput, pCompilerEx
 
          if tOutputLine is tMarker then
             return true
+         else
+            return false
          end if
       end if
    end repeat
