tests/run-tests.py

--- a/tests/run-tests.py	Wed Dec 16 17:40:01 2015 -0600
+++ b/tests/run-tests.py	Fri Dec 04 14:55:10 2015 -0600
@@ -1273,10 +1273,13 @@
             self.stop()
         else:
             with iolock:
-                if not self._options.nodiff:
-                    self.stream.write('\nERROR: %s output changed\n' % test)
+                if reason == "timed out":
+                    self.stream.write('t')
+                else:
+                    if not self._options.nodiff:
+                        self.stream.write('\nERROR: %s output changed\n' % test)
+                    self.stream.write('!')
 
-                self.stream.write('!')
                 self.stream.flush()
 
     def addSuccess(self, test):