diff options
| author | Peter Andersson <[email protected]> | 2015-05-09 02:02:14 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2015-05-09 02:02:14 +0200 |
| commit | 493772276f90e2a880cdc1e0091848a7088d247f (patch) | |
| tree | 2c6914165f4e73728ed7ec36319dd06db5c576fb /lib/test_server/src | |
| parent | b6b4fd292a7f63ce9f28c0248b0d8e646971c926 (diff) | |
| download | otp-493772276f90e2a880cdc1e0091848a7088d247f.tar.gz otp-493772276f90e2a880cdc1e0091848a7088d247f.tar.bz2 otp-493772276f90e2a880cdc1e0091848a7088d247f.zip | |
Fix problem with OTP benchmark tests failing to run
Diffstat (limited to 'lib/test_server/src')
| -rw-r--r-- | lib/test_server/src/ts.erl | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/lib/test_server/src/ts.erl b/lib/test_server/src/ts.erl index 469593e947..85f97656ff 100644 --- a/lib/test_server/src/ts.erl +++ b/lib/test_server/src/ts.erl @@ -262,18 +262,28 @@ run_all(_Vars) -> run_some([], _Opts) -> ok; -run_some([{App,Mod}|Apps], Opts) -> +run_some(Apps, Opts) -> + case proplists:get_value(test_category, Opts) of + bench -> + check_and_run(fun(Vars) -> ts_benchmark:run(Apps, Opts, Vars) end); + _Other -> + run_some1(Apps, Opts) + end. + +run_some1([], _Opts) -> + ok; +run_some1([{App,Mod}|Apps], Opts) -> case run(App, Mod, Opts) of ok -> ok; Error -> io:format("~p: ~p~n",[{App,Mod},Error]) end, - run_some(Apps, Opts); -run_some([App|Apps], Opts) -> + run_some1(Apps, Opts); +run_some1([App|Apps], Opts) -> case run(App, Opts) of ok -> ok; Error -> io:format("~p: ~p~n",[App,Error]) end, - run_some(Apps, Opts). + run_some1(Apps, Opts). %% This can be used from command line. Both App and %% TestCategory must be specified. App may be 'all' |