3 files changed, 37 insertions, 18 deletions

diff --git a/lib/common_test/test_server/ts_install.erl b/lib/common_test/test_server/ts_install.erl
index eb20e62128..048e5493d2 100644
--- a/lib/common_test/test_server/ts_install.erl
+++ b/lib/common_test/test_server/ts_install.erl
@@ -406,17 +406,13 @@ off_heap_msgq() ->
     end.
 
 schedulers() ->
-    case catch erlang:system_info(smp_support) of
-	true ->
-	    case {erlang:system_info(schedulers),
-		  erlang:system_info(schedulers_online)} of
-		{S,S} ->
-		    "/S"++integer_to_list(S);
-		{S,O} ->
-		    "/S"++integer_to_list(S) ++ ":" ++
-			integer_to_list(O)
-	    end;
-	_ -> ""
+    case {erlang:system_info(schedulers),
+          erlang:system_info(schedulers_online)} of
+        {S,S} ->
+            "/S"++integer_to_list(S);
+        {S,O} ->
+            "/S"++integer_to_list(S) ++ ":" ++
+                integer_to_list(O)
     end.
 
 bind_type() ->
diff --git a/lib/common_test/test_server/ts_lib.erl b/lib/common_test/test_server/ts_lib.erl
index c9ed738ed0..da8d676b18 100644
--- a/lib/common_test/test_server/ts_lib.erl
+++ b/lib/common_test/test_server/ts_lib.erl
@@ -120,7 +120,8 @@ specs(Dir) ->
 				      []
 			      end
 		      end, Specs),
-    sort_tests(MainSpecs).
+
+    sort_tests(filter_tests(MainSpecs)).
 
 test_categories(Dir, App) ->
     Specs = filelib:wildcard(filename:join([filename:dirname(Dir),
@@ -141,10 +142,29 @@ suites(Dir, App) ->
 			"*_SUITE.erl"]),
     Suites=filelib:wildcard(Glob),
     [filename_to_atom(Name) || Name <- Suites].
-    
+
 filename_to_atom(Name) ->
     list_to_atom(filename:rootname(filename:basename(Name))).
 
+%% Filter out tests of applications that are not accessible
+
+filter_tests(Tests) ->
+    lists:filter(
+      fun(Special) when Special == epmd;
+                        Special == emulator;
+                        Special == system ->
+              true;
+         (Test) ->
+              case application:load(filename_to_atom(Test)) of
+                  {error, {already_loaded, _}} ->
+                      true;
+                  {error,_NoSuchApplication} ->
+                      false;
+                  _ ->
+                      true
+              end
+      end, Tests).
+
 %% Sorts a list of either log files directories or spec files.
 
 sort_tests(Tests) ->
diff --git a/lib/common_test/test_server/ts_run.erl b/lib/common_test/test_server/ts_run.erl
index ee62b3d596..3f594236bc 100644
--- a/lib/common_test/test_server/ts_run.erl
+++ b/lib/common_test/test_server/ts_run.erl
@@ -96,6 +96,9 @@ ct_run_test(Dir, CommonTestArgs) ->
 	case ct:run_test(CommonTestArgs) of
 	    {_,_,_} ->
 		ok;
+            {error,{make_failed, _Modules} = Error} ->
+		io:format("ERROR: ~P\n", [Error,20]),
+                erlang:halt(123, [{flush,false}]);
 	    {error,Error} ->
 		io:format("ERROR: ~P\n", [Error,20]);
 	    Other ->
@@ -204,11 +207,7 @@ make_command(Vars, Spec, State) ->
 		      _ ->
 			  ok
 		  end,
-		  "cerl -valgrind" ++
-		      case erlang:system_info(smp_support) of
-			  true -> " -smp";
-			  false -> ""
-		      end
+		  "cerl -valgrind"
 	  end,
     Naming =
 	case ts_lib:var(longnames, Vars) of
@@ -288,6 +287,10 @@ tricky_print_data(Port, Timeout) ->
             receive
                 {Port, {exit_status, 0}} ->
                     ok;
+                {Port, {exit_status, 123 = N}} ->
+                    io:format(user, "Test run exited with status ~p,"
+                              "aborting rest of test~n", [N]),
+                    erlang:halt(123, [{flush,false}]);
                 {Port, {exit_status, N}} ->
                     io:format(user, "Test run exited with status ~p~n", [N])
             after 1 ->