From 362bccfd7d2bcb15e5c62cb17d31442713a5a20b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 30 Aug 2016 10:27:46 +0200
Subject: 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.
---
 lib/common_test/src/ct_make.erl                | 2 ++
 lib/common_test/src/erl2html2.erl              | 2 ++
 lib/common_test/test/ct_auto_compile_SUITE.erl | 1 +
 lib/tools/src/make.erl                         | 2 ++
 lib/tools/test/make_SUITE_data/test1.erl       | 2 ++
 5 files changed, 9 insertions(+)

(limited to 'lib')

diff --git a/lib/common_test/src/ct_make.erl b/lib/common_test/src/ct_make.erl
index e7a9cfa843..f22959d457 100644
--- a/lib/common_test/src/ct_make.erl
+++ b/lib/common_test/src/ct_make.erl
@@ -342,5 +342,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/common_test/src/erl2html2.erl b/lib/common_test/src/erl2html2.erl
index e819f345de..7f3eb699de 100644
--- a/lib/common_test/src/erl2html2.erl
+++ b/lib/common_test/src/erl2html2.erl
@@ -130,6 +130,8 @@ parse_preprocessed_file(Epp, File, InCorrectFile) ->
 	    throw({error,Reason,InCorrectFile});
 	{error,_Reason} ->
 	    parse_preprocessed_file(Epp, File, InCorrectFile);
+	{warning,_} ->
+	    parse_preprocessed_file(Epp, File, InCorrectFile);
 	{eof,_Location} ->
 	    []
     end.
diff --git a/lib/common_test/test/ct_auto_compile_SUITE.erl b/lib/common_test/test/ct_auto_compile_SUITE.erl
index e6939d23c0..dface99b8f 100644
--- a/lib/common_test/test/ct_auto_compile_SUITE.erl
+++ b/lib/common_test/test/ct_auto_compile_SUITE.erl
@@ -27,6 +27,7 @@
 %%% The suites used for the test are located in the data directory.
 %%%-------------------------------------------------------------------
 -module(ct_auto_compile_SUITE).
+-warning("Ignore me -- testing that the debugger can handle warnings").
 
 -compile(export_all).
 
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.
 
-- 
cgit v1.2.3