diff options
| author | Patrik Nyblom <[email protected]> | 2010-09-10 14:37:02 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-09-10 14:37:02 +0200 |
| commit | 6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02 (patch) | |
| tree | 07492ef6b7f98ef05ecc47518038980173996480 /lib/test_server/src/ts_lib.erl | |
| parent | bf276aef756681bd2ccb31aff54b646ff6a68d73 (diff) | |
| parent | 19a3f0c5bab37ba261abbca6c0253c1e3cb4d3ac (diff) | |
| download | otp-6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02.tar.gz otp-6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02.tar.bz2 otp-6bdca85ec8e5a73aa00ad1da2ea45f4cf2f2ae02.zip | |
Merge branch 'pan/added-autoimports/OTP-8763' into dev
* pan/added-autoimports/OTP-8763:
Remove warnings for clashes with new autoimported BIFs
Add testcase for autoimport and the erlang.xml doc consistency
Correct erlang.xml regarding autoimports
Add new autoimports for R14B
Diffstat (limited to 'lib/test_server/src/ts_lib.erl')
| -rw-r--r-- | lib/test_server/src/ts_lib.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/test_server/src/ts_lib.erl b/lib/test_server/src/ts_lib.erl index c90f4e511b..2f0a4ea8c0 100644 --- a/lib/test_server/src/ts_lib.erl +++ b/lib/test_server/src/ts_lib.erl @@ -21,6 +21,8 @@ -include_lib("kernel/include/file.hrl"). -include("ts.hrl"). +%% Avoid warning for local function error/1 clashing with autoimported BIF. +-compile({no_auto_import,[error/1]}). -export([error/1, var/2, erlang_type/0, initial_capital/1, interesting_logs/1, specs/1, suites/2, last_test/1, |