]>
Commit | Line | Data |
---|---|---|
b02c59fe ER |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.2.015 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.2.015 | |
11 | Problem: "make all test install" doesn't stop when the test fails. (Daniel | |
12 | Shahaf) | |
13 | Solution: When test.log contains failures exit with non-zero status. | |
14 | Files: src/testdir/Makefile | |
15 | ||
16 | ||
17 | *** ../vim-7.2.014/src/testdir/Makefile Wed Jun 25 00:22:53 2008 | |
18 | --- src/testdir/Makefile Sun Sep 7 21:31:49 2008 | |
19 | *************** | |
20 | *** 26,40 **** | |
21 | ||
22 | .SUFFIXES: .in .out | |
23 | ||
24 | ! nongui: nolog $(SCRIPTS) | |
25 | ! @echo | |
26 | ! @cat test.log | |
27 | ! @echo ALL DONE | |
28 | ||
29 | ! gui: nolog $(SCRIPTS) $(SCRIPTS_GUI) | |
30 | @echo | |
31 | ! @cat test.log | |
32 | ! @echo ALL DONE | |
33 | ||
34 | $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) | |
35 | ||
36 | --- 26,42 ---- | |
37 | ||
38 | .SUFFIXES: .in .out | |
39 | ||
40 | ! nongui: nolog $(SCRIPTS) report | |
41 | ! | |
42 | ! gui: nolog $(SCRIPTS) $(SCRIPTS_GUI) report | |
43 | ||
44 | ! report: | |
45 | @echo | |
46 | ! @echo 'Test results:' | |
47 | ! @/bin/sh -c "if test -f test.log; \ | |
48 | ! then cat test.log; echo TEST FAILURE; exit 1; \ | |
49 | ! else echo ALL DONE; \ | |
50 | ! fi" | |
51 | ||
52 | $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) | |
53 | ||
54 | *************** | |
55 | *** 71,74 **** | |
56 | test60.out: test60.vim | |
57 | ||
58 | nolog: | |
59 | ! -echo Test results: >test.log | |
60 | --- 73,76 ---- | |
61 | test60.out: test60.vim | |
62 | ||
63 | nolog: | |
64 | ! -rm -f test.log | |
65 | *** ../vim-7.2.014/src/version.c Wed Sep 10 15:38:13 2008 | |
66 | --- src/version.c Wed Sep 10 18:23:38 2008 | |
67 | *************** | |
68 | *** 678,679 **** | |
69 | --- 678,681 ---- | |
70 | { /* Add new patch number below this line */ | |
71 | + /**/ | |
72 | + 15, | |
73 | /**/ | |
74 | ||
75 | -- | |
76 | Light travels faster than sound. This is why some people | |
77 | appear bright until you hear them speak | |
78 | ||
79 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
80 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
81 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
82 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |