Commits

Matt Knepley committed 112eb74

Builder: strip test output before comparing

Comments (0)

Files changed (1)

config/builder.py

        self.logPrint("MISCONFIGURATION: Regression output file %s (test %s) is missing" % (outputName, testNum), debugSection='screen')
    else:
      with file(outputName) as f:
-       validOutput = f.read().strip() # Jed is now stripping output it appears
+       output      = output.strip()
+       validOutput = f.read().strip().replace('\r', '') # Jed is now stripping output it appears
        if not validOutput == output:
          if replace:
            with file(outputName, 'w') as f: