1 files changed, 91 insertions, 10 deletions
diff --git a/lib/test_server/src/ts.erl b/lib/test_server/src/ts.erl
index db16b6ecd2..115e783070 100644
--- a/lib/test_server/src/ts.erl
+++ b/lib/test_server/src/ts.erl
@@ -259,14 +259,43 @@ run(List, Opts) when is_list(List), is_list(Opts) ->
 run(Testspec, Config) when is_atom(Testspec), is_list(Config) ->
     Options=check_test_get_opts(Testspec, Config),
     File=atom_to_list(Testspec),
-    Spec = case code:lib_dir(Testspec) of
-	       {error, bad_name} when Testspec /= emulator, 
-                                      Testspec /= system,
-                                      Testspec /= epmd ->
-		   create_skip_spec(Testspec, tests(Testspec));
-	       _ ->
-		   File++".spec"
-	       end,
+    WhatToDo =
+	case Testspec of
+	    %% Known to exist but fails generic tests below
+	    emulator -> test;
+	    system -> test;
+	    erl_interface -> test;
+	    epmd -> test;
+	    _ ->
+		case code:lib_dir(Testspec) of
+		    {error,bad_name} ->
+			%% Application does not exist
+			skip;
+		    Path ->
+			case file:read_file_info(filename:join(Path,"ebin")) of
+			    {ok,#file_info{type=directory}} ->
+				%% Erlang application is built
+				test;
+			    _ ->
+				case filelib:wildcard(
+				       filename:join([Path,"priv","*.jar"])) of
+				    [] ->
+					%% The application is not built
+					skip;
+				    [_|_] ->
+					%% Java application is built
+					test
+				end
+			end
+		end
+	end,
+    Spec =
+	case WhatToDo of
+	    skip ->
+		create_skip_spec(Testspec, tests(Testspec));
+	    test ->
+		File++".spec"
+	end,
     run_test(File, [{spec,[Spec]}], Options);
 %% Runs one module in a spec (interactive)
 run(Testspec, Mod) when is_atom(Testspec), is_atom(Mod) ->
@@ -498,8 +527,60 @@ estone(Opts) when is_list(Opts) -> run(emulator,estone_SUITE,Opts).
 cross_cover_analyse([Level]) ->
     cross_cover_analyse(Level);
 cross_cover_analyse(Level) ->
-    test_server_ctrl:cross_cover_analyse(Level).
-
+    Apps = get_last_app_tests(),
+    Modules = get_cross_modules(Apps,[]),
+    test_server_ctrl:cross_cover_analyse(Level,Apps,Modules).
+
+get_last_app_tests() ->
+    AllTests = filelib:wildcard(filename:join(["*","*_test.logs"])),
+    {ok,RE} = re:compile("^[^/]*/[^\.]*\.(.*)_test\.logs$"),
+    get_last_app_tests(AllTests,RE,[]).
+
+get_last_app_tests([Dir|Dirs],RE,Acc) ->
+    NewAcc =
+	case re:run(Dir,RE,[{capture,all,list}]) of
+	    {match,[Dir,AppStr]} ->
+		App = list_to_atom(AppStr),
+		case lists:keytake(App,1,Acc) of
+		    {value,{App,LastDir},Rest} ->
+			if Dir > LastDir ->
+				[{App,Dir}|Rest];
+			   true ->
+				Acc
+			end;
+		    false ->
+			[{App,Dir} | Acc]
+		end;
+	    _ ->
+		Acc
+	end,
+    get_last_app_tests(Dirs,RE,NewAcc);
+get_last_app_tests([],_,Acc) ->
+    Acc.
+
+get_cross_modules([{App,_}|Apps],Acc) ->
+    Mods = cross_modules(App),
+    get_cross_modules(Apps,lists:umerge(Mods,Acc));
+get_cross_modules([],Acc) ->
+    Acc.
+
+cross_modules(App) ->
+    case default_coverfile(App) of
+	none ->
+	    [];
+	File ->
+	    case catch file:consult(File) of
+		{ok,CoverSpec} ->
+		    case lists:keyfind(cross_apps,1,CoverSpec) of
+			false ->
+			    [];
+			{cross_apps,App,Modules} ->
+			    lists:usort(Modules)
+		    end;
+		_ ->
+		    []
+	    end
+    end.
 
 %%% Implementation.