aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJoakim Verona2012-05-21 09:11:22 +0200
committerJoakim Verona2012-05-21 09:11:22 +0200
commit4a375d74b404b40cec9f976dde29f01f02078875 (patch)
treedf857071e4ed914048cbfe1930f3728817b1f5d2 /test
parentaec4aaf7216eb43c374f7b065e518368adf316b7 (diff)
parenta52c0aa070a8d0919cf7c175d5a5f9a212ef3526 (diff)
downloademacs-4a375d74b404b40cec9f976dde29f01f02078875.tar.gz
emacs-4a375d74b404b40cec9f976dde29f01f02078875.zip
upstream
Diffstat (limited to 'test')
-rw-r--r--test/ChangeLog4
-rw-r--r--test/automated/Makefile.in2
-rw-r--r--test/automated/compile-tests.el2
3 files changed, 7 insertions, 1 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index f05c94152a3..ba6162ca241 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
12012-05-21 Glenn Morris <rgm@gnu.org>
2
3 * automated/Makefile.in (setwins): Scrap superfluous subshell.
4
12012-05-15 Teodor Zlatanov <tzz@lifelogs.com> 52012-05-15 Teodor Zlatanov <tzz@lifelogs.com>
2 6
3 * automated/url-util-tests.el: New file to test 7 * automated/url-util-tests.el: New file to test
diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index c07d5a1897d..4f2e8a59e49 100644
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -48,7 +48,7 @@ BYTE_COMPILE_EXTRA_FLAGS =
48emacs = EMACSLOADPATH=$(lispsrc):$(test) LC_ALL=C $(EMACS) $(EMACSOPT) 48emacs = EMACSLOADPATH=$(lispsrc):$(test) LC_ALL=C $(EMACS) $(EMACSOPT)
49 49
50# Common command to find subdirectories 50# Common command to find subdirectories
51setwins=subdirs=`(find . -type d -print)`; \ 51setwins=subdirs=`find . -type d -print`; \
52 for file in $$subdirs; do \ 52 for file in $$subdirs; do \
53 case $$file in */.* | */.*/* | */=* ) ;; \ 53 case $$file in */.* | */.*/* | */=* ) ;; \
54 *) wins="$$wins $$file" ;; \ 54 *) wins="$$wins $$file" ;; \
diff --git a/test/automated/compile-tests.el b/test/automated/compile-tests.el
index ad36c4296b4..ecd0e8856f7 100644
--- a/test/automated/compile-tests.el
+++ b/test/automated/compile-tests.el
@@ -199,6 +199,8 @@
199 ;; maven 199 ;; maven
200 ("FooBar.java:[111,53] no interface expected here" 200 ("FooBar.java:[111,53] no interface expected here"
201 1 53 111 "FooBar.java") 201 1 53 111 "FooBar.java")
202 (" [ERROR] /Users/cinsk/hello.java:[651,96] ';' expected"
203 15 96 651 "/Users/cinsk/hello.java") ;Bug#11517.
202 ;; mips-1 mips-2 204 ;; mips-1 mips-2
203 ("TrimMask (255) in solomon.c may be indistinguishable from TrimMasks (93) in solomo.c due to truncation" 205 ("TrimMask (255) in solomon.c may be indistinguishable from TrimMasks (93) in solomo.c due to truncation"
204 11 nil 255 "solomon.c") 206 11 nil 255 "solomon.c")