aboutsummaryrefslogtreecommitdiffstats
path: root/erts/test/erlc_SUITE.erl
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-09-13 12:15:25 +0200
committerHenrik Nord <[email protected]>2011-09-13 12:15:25 +0200
commitae7e9b6d23c63bf73d9e22ea0b21b79b51900655 (patch)
tree014a38031436168347d42d9fe906a5abda114fd7 /erts/test/erlc_SUITE.erl
parent7b5a8a65d1f4e8070fd1d771a79b7b5237100c63 (diff)
parente9e118a25ee822e4568d785844d249e083cd88cf (diff)
downloadotp-ae7e9b6d23c63bf73d9e22ea0b21b79b51900655.tar.gz
otp-ae7e9b6d23c63bf73d9e22ea0b21b79b51900655.tar.bz2
otp-ae7e9b6d23c63bf73d9e22ea0b21b79b51900655.zip
Merge branch 'dev' into major
Conflicts: lib/asn1/doc/src/asn1ct.xml
Diffstat (limited to 'erts/test/erlc_SUITE.erl')
-rw-r--r--erts/test/erlc_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/test/erlc_SUITE.erl b/erts/test/erlc_SUITE.erl
index 2b5cb11f02..a9e28672e3 100644
--- a/erts/test/erlc_SUITE.erl
+++ b/erts/test/erlc_SUITE.erl
@@ -79,7 +79,7 @@ compile_erl(Config) when is_list(Config) ->
?line run(Config, Cmd, FileName, "-Werror",
["compile: warnings being treated as errors\$",
- "Warning: function foo/0 is unused\$",
+ "function foo/0 is unused\$",
"_ERROR_"]),
%% Check a bad file.