merge trunk

2 files changed, 9 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index a7e22aa9ae1..72b44747bac 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * automated/compile-tests.el (compile-tests--test-regexps-data):
+        Add new data for msft's new format.
+
 2012-09-08  Dmitry Gutov  <dgutov@yandex.ru>
 
         * automated/ruby-mode-tests.el:
diff --git a/test/automated/compile-tests.el b/test/automated/compile-tests.el
index ecd0e8856f7..9415ee3a17e 100644
--- a/test/automated/compile-tests.el
+++ b/test/automated/compile-tests.el
@@ -215,6 +215,10 @@
      1 nil 23 "d:\\tmp\\test.c")
     ("d:\\tmp\\test.c(1145) : see declaration of 'nsRefPtr'"
      1 nil 1145 "d:\\tmp\\test.c")
+    ("1>test_main.cpp(29): error C2144: syntax error : 'int' should be preceded by ';'"
+     3 nil 29 "test_main.cpp")
+    ("1>test_main.cpp(29): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int"
+     3 nil 29 "test_main.cpp")
     ;; watcom
     ("..\src\ctrl\lister.c(109): Error! E1009: Expecting ';' but found '{'"
      1 nil 109 "..\src\ctrl\lister.c")