aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-08-30 10:27:46 +0200
committerBjörn Gustavsson <[email protected]>2016-08-30 14:15:55 +0200
commit362bccfd7d2bcb15e5c62cb17d31442713a5a20b (patch)
tree1e5c6b9f3667937252fa07c546fc7a13de7b1690 /lib/tools
parentb815d568e2e43d96698dbb8de6b993d55c1b14a0 (diff)
downloadotp-362bccfd7d2bcb15e5c62cb17d31442713a5a20b.tar.gz
otp-362bccfd7d2bcb15e5c62cb17d31442713a5a20b.tar.bz2
otp-362bccfd7d2bcb15e5c62cb17d31442713a5a20b.zip
make, ct_make: Handle warning attributes in source files
epp learned to handle the -warning() directive in 14d72f02, but make and ct_make were not updated to expect a {warning,_} return value from epp:parse_erl_form/1.
Diffstat (limited to 'lib/tools')
-rw-r--r--lib/tools/src/make.erl2
-rw-r--r--lib/tools/test/make_SUITE_data/test1.erl2
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.