diff -r 6810b3c166cc -r a1bbad0e5e24 tests/run-tests.py
--- a/tests/run-tests.py	Thu Feb 13 08:17:39 2014 +0100
+++ b/tests/run-tests.py	Thu Feb 13 08:26:13 2014 +0100
@@ -881,8 +881,9 @@
         return 's', test, msg
 
     def fail(msg, ret):
+        warned = ret is False
         if not options.nodiff:
-            log("\nERROR: %s %s" % (testpath, msg))
+            log("\n%s: %s %s" % (warned and 'Warning' or 'ERROR', test, msg))
         if (not ret and options.interactive
             and os.path.exists(testpath + ".err")):
             iolock.acquire()
@@ -895,7 +896,7 @@
                 else:
                     rename(testpath + ".err", testpath + ".out")
                 return '.', test, ''
-        return '!', test, msg
+        return warned and '~' or '!', test, msg
 
     def success():
         return '.', test, ''