diff options
| author | Björn Gustavsson <[email protected]> | 2011-02-22 12:11:30 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-08-18 10:00:28 +0200 |
| commit | f43c0a51cd15b2b0f8adba4bb9ec5531dd9d8820 (patch) | |
| tree | 10f86e9e6f6e9a409123093bf3fcc1cdb01658b9 /lib/test_server/include | |
| parent | ff79167a09a55c4dc57c7ce4b245235b03b00d9c (diff) | |
| download | otp-f43c0a51cd15b2b0f8adba4bb9ec5531dd9d8820.tar.gz otp-f43c0a51cd15b2b0f8adba4bb9ec5531dd9d8820.tar.bz2 otp-f43c0a51cd15b2b0f8adba4bb9ec5531dd9d8820.zip | |
common_test: Use line numbers in exceptions
Remove the old kludgy parse transformations and line numbers
macros in common_test and test_server, and use the line numbers
in exceptions instead.
Diffstat (limited to 'lib/test_server/include')
| -rw-r--r-- | lib/test_server/include/test_server.hrl | 5 | ||||
| -rw-r--r-- | lib/test_server/include/test_server_line.hrl | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/test_server/include/test_server.hrl b/lib/test_server/include/test_server.hrl index 4b96d84ace..36e7e1f83d 100644 --- a/lib/test_server/include/test_server.hrl +++ b/lib/test_server/include/test_server.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2009. All Rights Reserved. +%% Copyright Ericsson AB 1996-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -20,11 +20,10 @@ -ifdef(line_trace). -line_trace(true). -define(line, - put(test_server_loc,{?MODULE,?LINE}), io:format(lists:concat([?MODULE,",",integer_to_list(?LINE),": ~p"]), [erlang:now()]),). -else. --define(line,put(test_server_loc,{?MODULE,?LINE}),). +-define(line,). -endif. -define(t,test_server). -define(config,test_server:lookup_config). diff --git a/lib/test_server/include/test_server_line.hrl b/lib/test_server/include/test_server_line.hrl index 60ef860883..3c309d3ee5 100644 --- a/lib/test_server/include/test_server_line.hrl +++ b/lib/test_server/include/test_server_line.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2009. All Rights Reserved. +%% Copyright Ericsson AB 2004-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -16,5 +16,4 @@ %% %% %CopyrightEnd% %% --compile({parse_transform,test_server_line}). |