Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:Ledest:erlang:23
erlang
0701-mnesia-Avoid-compiler-warnings.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0701-mnesia-Avoid-compiler-warnings.patch of Package erlang
From d0cfa765a343a00507eed370055cd71aedfad167 Mon Sep 17 00:00:00 2001 From: Dan Gudmundsson <dgud@erlang.org> Date: Wed, 27 Oct 2021 12:07:31 +0200 Subject: [PATCH 1/3] mnesia: Avoid compiler warnings --- lib/mnesia/test/Makefile | 2 + lib/mnesia/test/mnesia_evil_coverage_test.erl | 8 +- lib/mnesia/test/mnesia_test_lib.hrl | 86 +++++++++---------- lib/mnesia/test/mt.erl | 2 +- 4 files changed, 50 insertions(+), 48 deletions(-) diff --git a/lib/mnesia/test/Makefile b/lib/mnesia/test/Makefile index 2b60caf5ee..7cc6ebb6d1 100644 --- a/lib/mnesia/test/Makefile +++ b/lib/mnesia/test/Makefile @@ -100,6 +100,8 @@ EBIN = . tests debug opt: $(TARGET_FILES) +$(TARGET_FILES): $(HRL_FILES) + $(EBIN)/%.beam: $(DocExamplesDir)/%.erl $(ERLC) -bbeam $(ERL_COMPILE_FLAGS) -o$(EBIN) $< diff --git a/lib/mnesia/test/mnesia_evil_coverage_test.erl b/lib/mnesia/test/mnesia_evil_coverage_test.erl index f6f2bfd45e..5a664f3834 100644 --- a/lib/mnesia/test/mnesia_evil_coverage_test.erl +++ b/lib/mnesia/test/mnesia_evil_coverage_test.erl @@ -2572,8 +2572,8 @@ index_cleanup(Config) when is_list(Config) -> Tabs = [i_set, i_bag, i_oset], Add = fun(Tab) -> - Write = fun(Tab) -> - Recs = [{Tab, N, N rem 5} || N <- lists:seq(1,10)], + Write = fun(Table) -> + Recs = [{Table, N, N rem 5} || N <- lists:seq(1,10)], [ok = mnesia:write(Rec) || Rec <- Recs], Recs end, @@ -2582,8 +2582,8 @@ index_cleanup(Config) when is_list(Config) -> end, IRead = fun(Tab) -> - Read = fun(Tab) -> - [mnesia:index_read(Tab, N, val) || N <- lists:seq(0,4)] + Read = fun(Table) -> + [mnesia:index_read(Table, N, val) || N <- lists:seq(0,4)] end, {atomic, Recs} = mnesia:transaction(Read, [Tab]), lists:sort(lists:flatten(Recs)) diff --git a/lib/mnesia/test/mnesia_test_lib.hrl b/lib/mnesia/test/mnesia_test_lib.hrl index b8eeb5783f..77b5e543d2 100644 --- a/lib/mnesia/test/mnesia_test_lib.hrl +++ b/lib/mnesia/test/mnesia_test_lib.hrl @@ -46,51 +46,51 @@ end()). -define(match(ExpectedRes,Expr), - fun() -> - try Expr of - _AR_0 = ExpectedRes -> - ?verbose("ok, ~n Result as expected:~p~n",[_AR_0]), - {success,_AR_0}; - _AR_0 -> - ?error("Not Matching Actual result was:~n ~p~n",[_AR_0]), - {fail,_AR_0} - catch - exit:{aborted, _ER_1}:Stacktrace when - element(1, _ER_1) =:= node_not_running; - element(1, _ER_1) =:= bad_commit; - element(1, _ER_1) =:= cyclic -> - %% Need to re-raise these to restart transaction - erlang:raise(exit, {aborted, _ER_1}, Stacktrace); - exit:_AR_1:Stacktrace -> - case fun(_AR_EXIT_) -> {'EXIT', _AR_EXIT_} end(_AR_1) of - _AR_2 = ExpectedRes -> - ?verbose("ok, ~n Result as expected:~p~n",[_AR_2]), - {success,_AR_2}; - _AR_2 -> - ?error("Not Matching Actual result was:~n ~p~n ~p~n", - [_AR_2, Stacktrace]), - {fail,_AR_2} - end; - _T1_:_AR_1:Stacktrace -> - ?error("Not Matching Actual result was:~n ~p~n ~p~n", - [{_T1_,_AR_1}, Stacktrace]), - {fail,{_T1_,_AR_1}} - end - end()). + (_ = fun() -> + try Expr of + _AR_0 = ExpectedRes -> + ?verbose("ok, ~n Result as expected:~p~n",[_AR_0]), + {success,_AR_0}; + _AR_0 -> + ?error("Not Matching Actual result was:~n ~p~n",[_AR_0]), + {fail,_AR_0} + catch + exit:{aborted, _ER_1}:Stacktrace when + element(1, _ER_1) =:= node_not_running; + element(1, _ER_1) =:= bad_commit; + element(1, _ER_1) =:= cyclic -> + %% Need to re-raise these to restart transaction + erlang:raise(exit, {aborted, _ER_1}, Stacktrace); + exit:_AR_1:Stacktrace -> + case fun(_AR_EXIT_) -> {'EXIT', _AR_EXIT_} end(_AR_1) of + _AR_2 = ExpectedRes -> + ?verbose("ok, ~n Result as expected:~p~n",[_AR_2]), + {success,_AR_2}; + _AR_2 -> + ?error("Not Matching Actual result was:~n ~p~n ~p~n", + [_AR_2, Stacktrace]), + {fail,_AR_2} + end; + _T1_:_AR_1:Stacktrace -> + ?error("Not Matching Actual result was:~n ~p~n ~p~n", + [{_T1_,_AR_1}, Stacktrace]), + {fail,{_T1_,_AR_1}} + end + end())). -define(match_inverse(NotExpectedRes,Expr), - fun() -> - AcTuAlReS = (catch (Expr)), - case AcTuAlReS of - NotExpectedRes -> - ?error("Not matching Actual result was:~n ~p~n", - [AcTuAlReS]), - {fail,AcTuAlReS}; - _ -> - ?verbose("ok, ~n Result as expected: ~p~n",[AcTuAlReS]), - {success,AcTuAlReS} - end - end()). + (_ = fun() -> + AcTuAlReS = (catch (Expr)), + case AcTuAlReS of + NotExpectedRes -> + ?error("Not matching Actual result was:~n ~p~n", + [AcTuAlReS]), + {fail,AcTuAlReS}; + _ -> + ?verbose("ok, ~n Result as expected: ~p~n",[AcTuAlReS]), + {success,AcTuAlReS} + end + end())). -define(match_receive(ExpectedMsg), ?match(ExpectedMsg,mnesia_test_lib:pick_msg())). diff --git a/lib/mnesia/test/mt.erl b/lib/mnesia/test/mt.erl index 75ed856a95..e086bac439 100644 --- a/lib/mnesia/test/mt.erl +++ b/lib/mnesia/test/mt.erl @@ -39,7 +39,7 @@ read_config/0, write_config/1 % Config admin ]). --include("mnesia_test_lib.hrl"). +-compile({no_auto_import,[alias/1]}). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Aliases for the (sub) test suites -- 2.31.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor