6 files changed, 26 insertions, 37 deletions
diff --git a/lib/stdlib/src/erl_compile.erl b/lib/stdlib/src/erl_compile.erl
index ff032b129c..81bec21a3f 100644
--- a/lib/stdlib/src/erl_compile.erl
+++ b/lib/stdlib/src/erl_compile.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -57,17 +57,7 @@ compile_cmdline(List) ->
     end.
 
 my_halt(Reason) ->
-    case process_info(group_leader(), status) of
-	{_,waiting} ->
-	    %% Now all output data is down in the driver.
-	    %% Give the driver some extra time before halting.
-	    receive after 1 -> ok end,
-	    halt(Reason);
-	_ ->
-	    %% Probably still processing I/O requests.
-	    erlang:yield(),
-	    my_halt(Reason)
-    end.
+    erlang:halt(Reason).
 
 %% Run the the compiler in a separate process, trapping EXITs.
 
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl
index cd3b531d10..3063881890 100644
--- a/lib/stdlib/src/erl_internal.erl
+++ b/lib/stdlib/src/erl_internal.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -287,6 +287,7 @@ bif(group_leader, 0) -> true;
 bif(group_leader, 2) -> true;
 bif(halt, 0) -> true;
 bif(halt, 1) -> true;
+bif(halt, 2) -> true;
 bif(hd, 1) -> true;
 bif(integer_to_list, 1) -> true;
 bif(integer_to_list, 2) -> true;
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl
index ad49d89908..27e70ac4d4 100644
--- a/lib/stdlib/src/escript.erl
+++ b/lib/stdlib/src/escript.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -848,17 +848,7 @@ fatal(Str) ->
     throw(Str).
 
 my_halt(Reason) ->
-    case process_info(group_leader(), status) of
-        {_,waiting} ->
-            %% Now all output data is down in the driver.
-            %% Give the driver some extra time before halting.
-            receive after 1 -> ok end,
-            halt(Reason);
-        _ ->
-            %% Probably still processing I/O requests.
-            erlang:yield(),
-            my_halt(Reason)
-    end.
+    erlang:halt(Reason).
 
 hidden_apply(App, M, F, Args) ->
     try
diff --git a/lib/stdlib/test/edlin_expand_SUITE.erl b/lib/stdlib/test/edlin_expand_SUITE.erl
index a0e198ce09..f8d4fb4b6a 100644
--- a/lib/stdlib/test/edlin_expand_SUITE.erl
+++ b/lib/stdlib/test/edlin_expand_SUITE.erl
@@ -46,10 +46,10 @@ groups() ->
     [].
 
 init_per_suite(Config) ->
-    true = code:delete(expand_test),
-    true = code:delete(expand_test1),
-    true = code:delete('ExpandTestCaps'),
-    true = code:delete('ExpandTestCaps1'),
+    (catch code:delete(expand_test)),
+    (catch code:delete(expand_test1)),
+    (catch code:delete('ExpandTestCaps')),
+    (catch code:delete('ExpandTestCaps1')),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl
index b69cd74edb..0b74d04b85 100644
--- a/lib/stdlib/test/io_proto_SUITE.erl
+++ b/lib/stdlib/test/io_proto_SUITE.erl
@@ -50,7 +50,7 @@
 -define(privdir(Conf), ?config(priv_dir, Conf)).
 -endif.
 
--define(debug, true).
+%%-define(debug, true).
 
 -ifdef(debug).
 -define(format(S, A), io:format(S, A)).
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index 50a76cdfb5..1e74ad7727 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -7927,15 +7927,23 @@ run_test(Config, Extra, {cres, Body, Opts, ExpectedCompileReturn}) ->
             ok
     end,
 
+    wait_for_expected(R, Before, SourceFile, true),
+    code:purge(Mod);
+run_test(Config, Extra, Body) ->
+    run_test(Config, Extra, {cres,Body,[]}).
+
+wait_for_expected(R, Before, SourceFile, Wait) ->
     Ms = erlang:process_info(self(),messages),
     After = {get(), pps(), ets:all(), Ms},
-    code:purge(Mod),
     case {R, After} of
-        {ok, Before} -> ok;
-        _ -> expected({ok,Before}, {R,After}, SourceFile)
-    end;
-run_test(Config, Extra, Body) ->
-    run_test(Config, Extra, {cres,Body,[]}).
+        {ok, Before} ->
+            ok;
+        _ when Wait ->
+            timer:sleep(1000),
+            wait_for_expected(R, Before, SourceFile, false);
+        _ ->
+            expected({ok,Before}, {R,After}, SourceFile)
+    end.
 
 unload_pt() ->
     erlang:garbage_collect(), % get rid of references to qlc_pt...