diff options
| author | Björn Gustavsson <[email protected]> | 2016-02-18 15:55:37 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-02-18 15:55:37 +0100 |
| commit | 24f0d567ceffb0f1555bc3032b7801ba377e5a3b (patch) | |
| tree | 7ddc913ec28740fb152babae474b42cb5d554b11 /erts/test/run_erl_SUITE.erl | |
| parent | 6b9b39aca9a25a328f1dc4553120f7c8f26b5648 (diff) | |
| parent | dcda9b507bf14391c8bed91bfa9c56355342b681 (diff) | |
| download | otp-24f0d567ceffb0f1555bc3032b7801ba377e5a3b.tar.gz otp-24f0d567ceffb0f1555bc3032b7801ba377e5a3b.tar.bz2 otp-24f0d567ceffb0f1555bc3032b7801ba377e5a3b.zip | |
Merge branch 'bjorn/remove-test_server/OTP-12705'
* bjorn/remove-test_server/OTP-12705:
Remove test_server as a standalone application
Erlang mode for Emacs: Include ct.hrl instead test_server.hrl
Remove out-commented references to the test_server applications
Makefiles: Remove test_server from include path and code path
Eliminate use of test_server.hrl and test_server_line.hrl
Diffstat (limited to 'erts/test/run_erl_SUITE.erl')
| -rw-r--r-- | erts/test/run_erl_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/test/run_erl_SUITE.erl b/erts/test/run_erl_SUITE.erl index 6759d41a2b..e3c563d3d9 100644 --- a/erts/test/run_erl_SUITE.erl +++ b/erts/test/run_erl_SUITE.erl @@ -26,7 +26,7 @@ basic/1,heavy/1,heavier/1,defunct/1]). -export([ping_me_back/1]). --include_lib("test_server/include/test_server.hrl"). +-include_lib("common_test/include/ct.hrl"). init_per_testcase(_Case, Config) -> Dog = ?t:timetrap(?t:minutes(2)), |