aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Bolinder <hasse@erlang.org>2013-01-25 14:22:48 +0100
committerHans Bolinder <hasse@erlang.org>2013-01-25 14:22:48 +0100
commit907d498ff798345fc8e8b71fc08a1c5b40112037 (patch)
tree4e45a30130d6d8812d3db34777262ebc9289e3e7
parenta61153fba78a1261563863dab5267513650bd4a4 (diff)
parentcf34f6cbdb135d1c39ca9336e88ca3070ada4b3e (diff)
downloadotp-907d498ff798345fc8e8b71fc08a1c5b40112037.tar.gz
otp-907d498ff798345fc8e8b71fc08a1c5b40112037.tar.bz2
otp-907d498ff798345fc8e8b71fc08a1c5b40112037.zip
Merge branch 'hb/stdlib/fix_qlc_suite/OTP-10771'
* hb/stdlib/fix_qlc_suite/OTP-10771: [stdlib] Fix minor issue with qlc_SUITE
-rw-r--r--lib/stdlib/test/qlc_SUITE.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index cac8309bd9..a9ea78a58b 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. 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
@@ -6663,7 +6663,7 @@ otp_7714(Config) when is_list(Config) ->
{A,I1} <- ets:table(E1),
{B,I2} <- ets:table(E2),
I1 =:= I2],{join,merge}),
- [{a,1},{a,2},{a,3}] = qlc:e(Q),
+ [{a,1},{a,2},{a,3}] = lists:sort(qlc:e(Q)),
ets:delete(E1),
ets:delete(E2)">>],
?line run(Config, Ts).
@@ -6728,7 +6728,7 @@ otp_6674(Config) when is_list(Config) ->
[{join,lookup}]}}],
[]} = qlc:info(Q, {format,debug}),
{0,1,0,0} = join_info(Q),
- [{1.0,1},{2,2}] = qlc:e(Q),
+ [{1.0,1},{2,2}] = lists:sort(qlc:e(Q)),
ets:delete(E1),
ets:delete(E2)">>,
<<"E1 = ets:new(join, [ordered_set]),