diff options
author | Glenn Morris <rgm@gnu.org> | 2020-02-20 07:50:30 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2020-02-20 07:50:30 -0800 |
commit | 398afbaf6f31d89b5cb813b75a28b98cf7b1acd2 (patch) | |
tree | 587f23019db4d4b1a5b138c741dd2895483cbca8 /test/lisp/progmodes/compile-tests.el | |
parent | 770f76f050376bbd77a3cc8cf44db57cf855a27c (diff) | |
parent | 9f0852474810311fd2b26fa3756ab6d816016389 (diff) | |
download | emacs-398afbaf6f31d89b5cb813b75a28b98cf7b1acd2.tar.gz |
Merge from origin/emacs-27
9f08524748 (origin/emacs-27) Fix broken regexps
1d10885763 ; spelling and comment fix
614203bc80 ; make change-history-commit
28399e585e * Makefile.in (PREFERRED_BRANCH): Now emacs-27.
62afbc513a Fix bug when visiting euc-jp-encoded directories
a2c4eeeecd Clarify when fixnums are used.
4e5ac4b0c6 Reorder discussion of integer basics
f765aad28b Make OMake support slightly less expensive (bug#39595)
39410cfc5a Speed up 'msft' and 'watcom' compilation error regexps
96a269d045 Speed up 'maven' compilation error message regexp
efc9d4fe3e Amend c-backward-sws better to handle multiline block comm...
Diffstat (limited to 'test/lisp/progmodes/compile-tests.el')
-rw-r--r-- | test/lisp/progmodes/compile-tests.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/lisp/progmodes/compile-tests.el b/test/lisp/progmodes/compile-tests.el index 350b4eb400f..75962566f14 100644 --- a/test/lisp/progmodes/compile-tests.el +++ b/test/lisp/progmodes/compile-tests.el @@ -242,7 +242,7 @@ ;; maven ("FooBar.java:[111,53] no interface expected here" 1 53 111 "FooBar.java" 2) - (" [ERROR] /Users/cinsk/hello.java:[651,96] ';' expected" + ("[ERROR] /Users/cinsk/hello.java:[651,96] ';' expected" 15 96 651 "/Users/cinsk/hello.java" 2) ;Bug#11517. ("[WARNING] /foo/bar/Test.java:[27,43] unchecked conversion" 11 43 27 "/foo/bar/Test.java" 1) ;Bug#20556 @@ -269,6 +269,9 @@ 1 nil 109 "..\\src\\ctrl\\lister.c") ("..\\src\\ctrl\\lister.c(120): Warning! W201: Unreachable code" 1 nil 120 "..\\src\\ctrl\\lister.c") + ;; omake + (" alpha.c:5:15: error: expected ';' after expression" + 1 15 5 "alpha.c") ;; oracle ("Semantic error at line 528, column 5, file erosacqdb.pc:" 1 5 528 "erosacqdb.pc") @@ -428,7 +431,7 @@ The test data is in `compile-tests--test-regexps-data'." (compilation-num-warnings-found 0) (compilation-num-infos-found 0)) (mapc #'compile--test-error-line compile-tests--test-regexps-data) - (should (eq compilation-num-errors-found 92)) + (should (eq compilation-num-errors-found 93)) (should (eq compilation-num-warnings-found 36)) (should (eq compilation-num-infos-found 26))))) |