diff options
| author | Björn Gustavsson <[email protected]> | 2016-08-31 11:52:02 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-08-31 11:52:02 +0200 |
| commit | 90831a4abf26023811bc5762c915e22e0d3e5708 (patch) | |
| tree | e70df48013003f59b3113c98e7ef02b8413f38e2 /lib/tools | |
| parent | 23f4ec514ad31fac4f6310ec3734050b11770e14 (diff) | |
| parent | ee8f2380837321fef4975522bfa53cb9161874ac (diff) | |
| download | otp-90831a4abf26023811bc5762c915e22e0d3e5708.tar.gz otp-90831a4abf26023811bc5762c915e22e0d3e5708.tar.bz2 otp-90831a4abf26023811bc5762c915e22e0d3e5708.zip | |
Merge branch 'maint'
* maint:
make, ct_make: Handle warning attributes in source files
Diffstat (limited to 'lib/tools')
| -rw-r--r-- | lib/tools/src/make.erl | 2 | ||||
| -rw-r--r-- | lib/tools/test/make_SUITE_data/test1.erl | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/tools/src/make.erl b/lib/tools/src/make.erl index 26378f28a0..37e67cbe34 100644 --- a/lib/tools/src/make.erl +++ b/lib/tools/src/make.erl @@ -317,5 +317,7 @@ check_includes2(Epp, File, ObjMTime) -> epp:close(Epp), false; {error, _Error} -> + check_includes2(Epp, File, ObjMTime); + {warning, _Warning} -> check_includes2(Epp, File, ObjMTime) end. diff --git a/lib/tools/test/make_SUITE_data/test1.erl b/lib/tools/test/make_SUITE_data/test1.erl index f4a133008e..9e21bdc767 100644 --- a/lib/tools/test/make_SUITE_data/test1.erl +++ b/lib/tools/test/make_SUITE_data/test1.erl @@ -3,6 +3,8 @@ -vsn('$Revision: /main/release/2 $'). -compile(export_all). +-warning("a warning"). + f1() -> true. |