Merge branch 'master' of git-server:otp

Conflicts:
	lib/orber/src/orber.app.src

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'