diff options
| author | Björn Gustavsson <[email protected]> | 2012-10-26 11:17:14 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-10-26 11:17:14 +0200 |
| commit | a6608f9e67b9f67e8d21bc3df81ba8129755741a (patch) | |
| tree | 725e0acb38cd9638799b678ed03bc05f3e217bfa /lib/test_server/test/test_server_SUITE.erl | |
| parent | 783c43072a97af9f4a6682c15000296aa2f75a9d (diff) | |
| parent | d0e2f7202ed7d69121185ce58f480174aa4aff9f (diff) | |
| download | otp-a6608f9e67b9f67e8d21bc3df81ba8129755741a.tar.gz otp-a6608f9e67b9f67e8d21bc3df81ba8129755741a.tar.bz2 otp-a6608f9e67b9f67e8d21bc3df81ba8129755741a.zip | |
Merge branch 'bjorn/test_server/test-cases'
* bjorn/test_server/test-cases:
test_server tests: Be kind to Windows by using shorter pathnames
Diffstat (limited to 'lib/test_server/test/test_server_SUITE.erl')
| -rw-r--r-- | lib/test_server/test/test_server_SUITE.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/test_server/test/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE.erl index cb8cb9da31..d20528d43b 100644 --- a/lib/test_server/test/test_server_SUITE.erl +++ b/lib/test_server/test/test_server_SUITE.erl @@ -120,9 +120,9 @@ run_test_server_tests(SuiteName, NCases, NFail, NExpected, NSucc, NUsrSkip, NAutoSkip, NActualSkip, NActualFail, NActualSucc, Config) -> + WorkDir = proplists:get_value(work_dir, Config), ct:log("<a href=\"file://~s\">Test case log files</a>\n", - [filename:join([proplists:get_value(priv_dir, Config), - SuiteName++".logs"])]), + [filename:join(WorkDir, SuiteName++".logs")]), Node = proplists:get_value(node, Config), {ok,_Pid} = rpc:call(Node,test_server_ctrl, start, []), @@ -140,8 +140,8 @@ run_test_server_tests(SuiteName, NCases, NFail, NExpected, NSucc, {ok,Data} = test_server_test_lib:parse_suite( hd(filelib:wildcard( - filename:join([proplists:get_value(priv_dir, Config), - SuiteName++".logs","run*","suite.log"])))), + filename:join([WorkDir,SuiteName++".logs", + "run*","suite.log"])))), check([{"Number of cases",NCases,Data#suite.n_cases}, {"Number failed",NFail,Data#suite.n_cases_failed}, {"Number expected",NExpected,Data#suite.n_cases_expected}, |