aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2015-05-11 23:16:15 +0200
committerPeter Andersson <[email protected]>2015-05-11 23:16:15 +0200
commit67282328c2bf85ece471b82724336fb3a5821b94 (patch)
tree73a602974ea141117d946794854c2e6d15f911bc /lib/test_server/src
parent0ce2534edb258f235f48c50dec14f553659662f0 (diff)
parent493772276f90e2a880cdc1e0091848a7088d247f (diff)
downloadotp-67282328c2bf85ece471b82724336fb3a5821b94.tar.gz
otp-67282328c2bf85ece471b82724336fb3a5821b94.tar.bz2
otp-67282328c2bf85ece471b82724336fb3a5821b94.zip
Merge branch 'peppe/ts/fix_benchmarks'
* peppe/ts/fix_benchmarks: Fix problem with OTP benchmark tests failing to run
Diffstat (limited to 'lib/test_server/src')
-rw-r--r--lib/test_server/src/ts.erl18
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'