diff options
author | Lukas Larsson <[email protected]> | 2011-02-28 17:30:09 +0100 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2011-02-28 17:30:09 +0100 |
commit | e4dca28b4dc0397d2fc37d9853452f5abc9c4211 (patch) | |
tree | ee03529859154b30cdb67eadc03fd155247c68f4 /lib/test_server/src/ts_install_cth.erl | |
parent | 68fd8d31a869908d008f8262310a0a1e6a12505b (diff) | |
parent | 19fa4c92edb358adaf21557b1a019a868d9e2af5 (diff) | |
download | otp-e4dca28b4dc0397d2fc37d9853452f5abc9c4211.tar.gz otp-e4dca28b4dc0397d2fc37d9853452f5abc9c4211.tar.bz2 otp-e4dca28b4dc0397d2fc37d9853452f5abc9c4211.zip |
Merge branch 'lukas/test_server/ts_migration/OTP-8768' into dev
* lukas/test_server/ts_migration/OTP-8768:
Update test_server tests to conform with common_test standard
Remove old test_server code
Diffstat (limited to 'lib/test_server/src/ts_install_cth.erl')
-rw-r--r-- | lib/test_server/src/ts_install_cth.erl | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/test_server/src/ts_install_cth.erl b/lib/test_server/src/ts_install_cth.erl index 3e28ebd529..f8b4e5a4f8 100644 --- a/lib/test_server/src/ts_install_cth.erl +++ b/lib/test_server/src/ts_install_cth.erl @@ -68,7 +68,6 @@ id(_Opts) -> -spec init(Id :: term(), Opts :: proplist()) -> State :: #state{}. init(_Id, Opts) -> -% ct:log("CurrWD: ~p",[file:get_cwd()]), Nodenames = proplists:get_value(nodenames, Opts, 0), Nodes = proplists:get_value(nodes, Opts, 0), TSConfDir = proplists:get_value(ts_conf_dir, Opts), @@ -93,13 +92,8 @@ pre_init_per_suite(Suite,Config,#state{ ts_conf_dir = undefined} = State) -> TSConfDir = filename:join([ParentDir, "..","test_server"]), pre_init_per_suite(Suite, Config, State#state{ ts_conf_dir = TSConfDir }); pre_init_per_suite(_Suite,Config,State) -> -% ct:log("pre_init_per_suite(~p,~p,~p)",[_Suite,Config,State]), DataDir = proplists:get_value(data_dir, Config), try -% install(State#state.ts_conf_dir, -% State#state.target_system, -% State#state.install_opts), - {ok,Variables} = file:consult(filename:join(State#state.ts_conf_dir,"variables")), @@ -221,7 +215,6 @@ on_tc_skip(_TC, _Reason, State) -> -spec terminate(State :: #state{}) -> term(). terminate(_State) -> -% ct:log("Terminate called"), ok. %%% ============================================================================ |