1 files changed, 22 insertions, 8 deletions

diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index 50a76cdfb5..192268f90e 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
@@ -2969,12 +2969,14 @@ lookup1(Config) when is_list(Config) ->
                 [3] = lookup_keys(Q)
         end, [{1,a},{3,3}])">>,
 
+      {cres,
        <<"A = 3,
           etsc(fun(E) ->
                 Q = qlc:q([X || X <- ets:table(E), A =:= {erlang,element}(1, X)]),
                 [{3,3}] = qlc:e(Q),
                 [3] = lookup_keys(Q)
         end, [{1,a},{3,3}])">>,
+       {warnings,[{3,erl_lint,deprecated_tuple_fun}]}},
 
        <<"etsc(fun(E) ->
                 A = 3,
@@ -3439,12 +3441,14 @@ lookup2(Config) when is_list(Config) ->
                  [r] = qlc:e(Q),
                  [r] = lookup_keys(Q)
          end, [{keypos,1}], [#r{}])">>,
+       {cres,
        <<"etsc(fun(E) ->
                 Q = qlc:q([element(1, X) || X <- ets:table(E), 
                                             {erlang,is_record}(X, r, 2)]),
                  [r] = qlc:e(Q),
                  [r] = lookup_keys(Q)
          end, [{keypos,1}], [#r{}])">>,
+        {warnings,[{4,erl_lint,deprecated_tuple_fun}]}},
        {cres,
         <<"etsc(fun(E) ->
                 Q = qlc:q([element(1, X) || X <- ets:table(E), 
@@ -3465,12 +3469,14 @@ lookup2(Config) when is_list(Config) ->
                  [r] = qlc:e(Q),
                  [r] = lookup_keys(Q)
          end, [{keypos,1}], [#r{}])">>,
+       {cres,
        <<"etsc(fun(E) ->
                 Q = qlc:q([element(1, X) || X <- ets:table(E), 
                                             {erlang,is_record}(X, r)]),
                  [r] = qlc:e(Q),
                  [r] = lookup_keys(Q)
-         end, [{keypos,1}], [#r{}])">>
+         end, [{keypos,1}], [#r{}])">>,
+        {warnings,[{4,erl_lint,deprecated_tuple_fun}]}}
 
        ],
     ?line run(Config, <<"-record(r, {a}).\n">>, TsR),
@@ -7927,15 +7933,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...