diff options
| author | Björn Gustavsson <[email protected]> | 2013-09-09 11:51:45 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-09-09 11:51:45 +0200 |
| commit | 2f2824519d13e7745c02efbc7c29c37a76885fee (patch) | |
| tree | e407c21c17d0dc52d4e2c75964c68b2f151a6eb9 /lib/compiler/test | |
| parent | 5943f00b6485ab54294f6fe1e404b15dd3cc9486 (diff) | |
| parent | 60984adef62f5e5bf8c65f403d4f8522afb6d40a (diff) | |
| download | otp-2f2824519d13e7745c02efbc7c29c37a76885fee.tar.gz otp-2f2824519d13e7745c02efbc7c29c37a76885fee.tar.bz2 otp-2f2824519d13e7745c02efbc7c29c37a76885fee.zip | |
Merge branch 'bjorn/compiler/return_errors/OTP-11304' into maint
* bjorn/compiler/return_errors/OTP-11304:
compiler: Conform returned errors to the documented format
Diffstat (limited to 'lib/compiler/test')
| -rw-r--r-- | lib/compiler/test/compile_SUITE.erl | 4 | ||||
| -rw-r--r-- | lib/compiler/test/core_fold_SUITE.erl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl index 97777568b6..be01ea713d 100644 --- a/lib/compiler/test/compile_SUITE.erl +++ b/lib/compiler/test/compile_SUITE.erl @@ -139,8 +139,8 @@ forms_2(Config) when is_list(Config) -> module_mismatch(Config) when is_list(Config) -> ?line DataDir = ?config(data_dir, Config), ?line File = filename:join(DataDir, "wrong_module_name.erl"), - ?line {error,[{"wrong_module_name.beam", - [{compile,{module_name,arne,"wrong_module_name"}}]}], + {error,[{"wrong_module_name.beam", + [{none,compile,{module_name,arne,"wrong_module_name"}}]}], []} = compile:file(File, [return]), ?line error = compile:file(File, [report]), diff --git a/lib/compiler/test/core_fold_SUITE.erl b/lib/compiler/test/core_fold_SUITE.erl index abc9ab6a72..a5a4e62a42 100644 --- a/lib/compiler/test/core_fold_SUITE.erl +++ b/lib/compiler/test/core_fold_SUITE.erl @@ -299,7 +299,7 @@ unused_multiple_values_error(Config) when is_list(Config) -> Opts = [no_copt,clint,return,from_core,{outdir,PrivDir} |test_lib:opt_opts(?MODULE)], {error,[{unused_multiple_values_error, - [{core_lint,{return_mismatch,{hello,1}}}]}], + [{none,core_lint,{return_mismatch,{hello,1}}}]}], []} = c:c(Core, Opts), ok. |