diff options
| author | Hans Bolinder <[email protected]> | 2017-03-14 14:15:47 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2017-03-14 14:15:47 +0100 |
| commit | dcba34b6295edca4cc9c899152612f410d23c1ef (patch) | |
| tree | 37d87f0b5189d6056c94d49ce395e96795c986b1 /lib/eunit | |
| parent | 318e9dfbba306e7b18f2e74d6f468c81e1ac1f57 (diff) | |
| parent | 568706c4c4b8261e7a63e20be9a355ebe5d6562e (diff) | |
| download | otp-dcba34b6295edca4cc9c899152612f410d23c1ef.tar.gz otp-dcba34b6295edca4cc9c899152612f410d23c1ef.tar.bz2 otp-dcba34b6295edca4cc9c899152612f410d23c1ef.zip | |
Merge branch 'hasse/fix_erl_anno_use'
* hasse/fix_erl_anno_use:
parsetools: Fix handling of locations and annotations
diameter: Fix handling of locations and annotations
kernel: Fix handling of locations and annotations
compiler: Fix handling of locations and annotations
eunit: Fix handling of locations and annotations
Update preloaded
erts: Fix handling of locations and annotations
dialyzer: Fix handling of annotations in a test
debugger: Fix handling of locations and annotations
stdlib: Extend functions in erl_parse to handle form_info()
stdlib: Fix handling of locations and annotations
erts: Correct the documentation of abstract end-of-file
stdlib: Add debug tests to the erl_parse module
stdlib: improve the erl_anno module's debug tests
stdlib: Improve the erl_pp module's debug tests
Diffstat (limited to 'lib/eunit')
| -rw-r--r-- | lib/eunit/src/eunit.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/eunit/src/eunit.erl b/lib/eunit/src/eunit.erl index 2c832a7f7a..1ace85ffde 100644 --- a/lib/eunit/src/eunit.erl +++ b/lib/eunit/src/eunit.erl @@ -256,7 +256,7 @@ all_options(Opts) -> false -> Opts; S -> {ok, Ts, _} = erl_scan:string(S), - {ok, V} = erl_parse:parse_term(Ts ++ [{dot,1}]), + {ok, V} = erl_parse:parse_term(Ts ++ [{dot,erl_anno:new(1)}]), if is_list(V) -> Opts ++ V; true -> Opts ++ [V] end |