aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2014-06-17 11:06:52 +0200
committerBjörn Gustavsson <[email protected]>2014-06-17 11:06:52 +0200
commitef1a60edd1cb8f1fffc4fa3b1995914efff5393d (patch)
tree62815b12dcb69906b2145a54b17d383438d4a213 /lib/compiler
parentefcd03504202c288047311368a729bc83f71ecaa (diff)
parenta182917681b28ec7129adf73d863fa6b11670c10 (diff)
downloadotp-ef1a60edd1cb8f1fffc4fa3b1995914efff5393d.tar.gz
otp-ef1a60edd1cb8f1fffc4fa3b1995914efff5393d.tar.bz2
otp-ef1a60edd1cb8f1fffc4fa3b1995914efff5393d.zip
Merge branch 'maint'
* maint: Fix handling of latin1 characters in false ifdef branches add_abstract_code: Remove 'from_asm' option Remove documentation and stub for non-exist file:file_info/1
Diffstat (limited to 'lib/compiler')
-rw-r--r--lib/compiler/test/warnings_SUITE.erl14
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/compiler/test/warnings_SUITE.erl b/lib/compiler/test/warnings_SUITE.erl
index ad4ad91f74..0637041873 100644
--- a/lib/compiler/test/warnings_SUITE.erl
+++ b/lib/compiler/test/warnings_SUITE.erl
@@ -662,6 +662,20 @@ latin1_fallback(Conf) when is_list(Conf) ->
{warnings,[{1,compile,reparsing_invalid_unicode}]}
}],
[] = run(Conf, Ts2),
+
+ Ts3 = [{latin1_fallback3,
+ %% Test that the compiler fall backs to latin-1 with
+ %% a warning if a file has no encoding and does not
+ %% contain correct UTF-8 sequences.
+ <<"-ifdef(NOTDEFINED).
+ t(_) -> \"",246,"\";
+ t(x) -> ok.
+ -endif.
+ ">>,
+ [],
+ {warnings,[{2,compile,reparsing_invalid_unicode}]}}],
+ [] = run(Conf, Ts3),
+
ok.
%%%