diff options
| author | Björn Gustavsson <[email protected]> | 2019-02-28 12:24:10 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2019-02-28 12:24:10 +0100 |
| commit | cee872cda90b837e64e531b499d8441fb8e6cbea (patch) | |
| tree | e8abe158608d5f4f68f7a5eb702b401b68332a23 /lib | |
| parent | 236436e82f97652c8375d51f8eded9bd4a3201f4 (diff) | |
| parent | c317106f450c49e7e6741af1c9d49ae7a378350f (diff) | |
| download | otp-cee872cda90b837e64e531b499d8441fb8e6cbea.tar.gz otp-cee872cda90b837e64e531b499d8441fb8e6cbea.tar.bz2 otp-cee872cda90b837e64e531b499d8441fb8e6cbea.zip | |
Merge branch 'bjorn/cuddle-with-tests'
* bjorn/cuddle-with-tests:
Fix failing test case binary_module_SUITE:copy/1
Fix failing test case qlc_SUITE:lookup2/1
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/test/binary_module_SUITE.erl | 5 | ||||
| -rw-r--r-- | lib/stdlib/test/qlc_SUITE.erl | 10 |
2 files changed, 5 insertions, 10 deletions
diff --git a/lib/stdlib/test/binary_module_SUITE.erl b/lib/stdlib/test/binary_module_SUITE.erl index e0811f19cf..9b2033ec4a 100644 --- a/lib/stdlib/test/binary_module_SUITE.erl +++ b/lib/stdlib/test/binary_module_SUITE.erl @@ -755,8 +755,9 @@ list_to_bin(Config) when is_list(Config) -> copy(Config) when is_list(Config) -> <<1,2,3>> = binary:copy(<<1,2,3>>), RS = random_string({1,10000}), - RS = RS2 = binary:copy(RS), - false = erts_debug:same(RS,RS2), + RS2 = binary:copy(RS), + true = RS =:= RS2, + false = erts_debug:same(RS, RS2), <<>> = ?MASK_ERROR(binary:copy(<<1,2,3>>,0)), badarg = ?MASK_ERROR(binary:copy(<<1,2,3:3>>,2)), badarg = ?MASK_ERROR(binary:copy([],0)), diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl index d7354438f9..2354a08f78 100644 --- a/lib/stdlib/test/qlc_SUITE.erl +++ b/lib/stdlib/test/qlc_SUITE.erl @@ -3163,19 +3163,13 @@ lookup2(Config) when is_list(Config) -> [a] = lookup_keys(Q) end, [{a},{b},{c}])">>, - {cres, - <<"etsc(fun(E) -> + <<"etsc(fun(E) -> Q = qlc:q([X || {X}=Y <- ets:table(E), element(2, Y) == b, X =:= 1]), [] = qlc:e(Q), false = lookup_keys(Q) - end, [{1,b},{2,3}])">>, - %% {warnings,[{2,sys_core_fold,nomatch_guard}, - %% {3,qlc,nomatch_filter}, - %% {3,sys_core_fold,{eval_failure,badarg}}]}}, - {warnings,[{2,sys_core_fold,nomatch_guard}, - {3,sys_core_fold,{eval_failure,badarg}}]}}, + end, [{1,b},{2,3}])">>, <<"etsc(fun(E) -> Q = qlc:q([X || {X} <- ets:table(E), element(1,{X}) =:= 1]), |