File 2621-Remove-and-or-in-common_test.patch of Package erlang
From 88b24286e8e9bd7868691f0032d615de2819e7c1 Mon Sep 17 00:00:00 2001
From: Maria Scott <maria-12648430@hnc-agency.org>
Date: Mon, 26 Jan 2026 12:37:27 +0100
Subject: [PATCH] Remove and/or in common_test
---
lib/common_test/src/ct_framework.erl | 19 ++++-----
lib/common_test/src/ct_groups.erl | 4 +-
lib/common_test/src/ct_logs.erl | 12 +++---
lib/common_test/src/ct_run.erl | 50 ++++++++++++------------
lib/common_test/src/ct_slave.erl | 4 +-
lib/common_test/src/ct_telnet.erl | 4 +-
lib/common_test/src/ct_testspec.erl | 20 +++++-----
lib/common_test/src/test_server_ctrl.erl | 12 +++---
8 files changed, 54 insertions(+), 71 deletions(-)
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 4733d783b6..0b92330041 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -413,8 +411,8 @@ add_defaults1(Mod,Func, GroupPath, SuiteInfo) ->
%% find and save require terms found in suite info
SuiteReqs =
[SDDef || SDDef <- SuiteInfo,
- ((require == element(1,SDDef))
- or (default_config == element(1,SDDef)))],
+ require == element(1,SDDef)
+ orelse default_config == element(1,SDDef)],
case check_for_clashes(TestCaseInfo, GroupPathInfo,
SuiteReqs) of
[] ->
@@ -465,13 +463,12 @@ remove_info_in_prev(Terms, [[] | Rest]) ->
[[] | remove_info_in_prev(Terms, Rest)];
remove_info_in_prev(Terms, [Info | Rest]) ->
UniqueInInfo = [U || U <- Info,
- ((timetrap == element(1,U)) and
- (not lists:keymember(timetrap,1,Terms))) or
- ((require == element(1,U)) and
- (not lists:member(U,Terms))) or
- ((default_config == element(1,U)) and
- (not keysmember([default_config,1,
- element(2,U),2], Terms)))],
+ timetrap == element(1, U) andalso
+ not lists:keymember(timetrap, 1, Terms) orelse
+ require == element(1, U) andalso
+ not lists:member(U,Terms) orelse
+ default_config == element(1,U) andalso
+ not keysmember([default_config, 1, element(2, U), 2], Terms)],
OtherTermsInInfo = [T || T <- Info,
timetrap /= element(1,T),
require /= element(1,T),
diff --git a/lib/common_test/src/ct_groups.erl b/lib/common_test/src/ct_groups.erl
index 416d0b8a57..1165db7fd6 100644
--- a/lib/common_test/src/ct_groups.erl
+++ b/lib/common_test/src/ct_groups.erl
@@ -62,7 +60,7 @@ find_groups1(Mod, GrNames, TCs, GroupDefs) ->
Path ->
{Path,true}
end,
- TCs1 = if (is_atom(TCs) and (TCs /= all)) or is_tuple(TCs) ->
+ TCs1 = if is_atom(TCs), TCs /= all; is_tuple(TCs) ->
[TCs];
true ->
TCs
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index 9ca5a9eebe..a3e1500017 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -833,7 +831,7 @@ logger_loop(State) ->
end,
if Importance >= (100-VLvl) ->
CtLogFd = State#logger_state.ct_log_fd,
- DoEscChars = State#logger_state.tc_esc_chars and EscChars,
+ DoEscChars = State#logger_state.tc_esc_chars andalso EscChars,
case get_groupleader(Pid, GL, State) of
{tc_log,TCGL,TCGLs} ->
case erlang:is_process_alive(TCGL) of
@@ -1505,8 +1503,8 @@ make_one_index_entry1(SuiteName, Link, Label, Success, Fail, UserSkip, AutoSkip,
integer_to_list(NotBuilt),"</a></td>\n"]
end,
FailStr =
- if (Fail > 0) or (NotBuilt > 0) or
- ((Success+Fail+UserSkip+AutoSkip) == 0) ->
+ if Fail > 0; NotBuilt > 0;
+ Success+Fail+UserSkip+AutoSkip == 0 ->
["<font color=\"red\">",
integer_to_list(Fail),"</font>"];
true ->
@@ -2290,8 +2288,8 @@ runentry(Dir, undefined, _) ->
runentry(Dir, Totals={Node,Label,Logs,
{TotSucc,TotFail,UserSkip,AutoSkip,NotBuilt}}, Index) ->
TotFailStr =
- if (TotFail > 0) or (NotBuilt > 0) or
- ((TotSucc+TotFail+UserSkip+AutoSkip) == 0) ->
+ if TotFail > 0; NotBuilt > 0;
+ TotSucc+TotFail+UserSkip+AutoSkip == 0 ->
["<font color=\"red\">",
integer_to_list(TotFail),"</font>"];
true ->
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index cc55dcd325..9c91211d82 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -1276,10 +1274,10 @@ run_dir(Opts = #opts{logdir = LogDir,
true -> D end || D <- Dirs],
reformat_result(catch do_run(tests(Dirs1), [], Opts1, StartOpts));
- {Dir=[Hd|_],undefined,[]} when is_list(Dir) and is_integer(Hd) ->
+ {Dir=[Hd|_],undefined,[]} when is_list(Dir), is_integer(Hd) ->
reformat_result(catch do_run(tests(Dir), [], Opts1, StartOpts));
- {Dir,undefined,[]} when is_atom(Dir) and (Dir /= undefined) ->
+ {Dir,undefined,[]} when is_atom(Dir), Dir /= undefined ->
reformat_result(catch do_run(tests(atom_to_list(Dir)),
[], Opts1, StartOpts));
@@ -1287,13 +1285,13 @@ run_dir(Opts = #opts{logdir = LogDir,
Suites1 = [suite_to_test(S) || S <- Suites],
reformat_result(catch do_run(tests(Suites1), [], Opts1, StartOpts));
- {undefined,Suite,[]} when is_atom(Suite) and
- (Suite /= undefined) ->
+ {undefined,Suite,[]} when is_atom(Suite),
+ Suite /= undefined ->
{Dir,Mod} = suite_to_test(Suite),
reformat_result(catch do_run(tests(Dir, Mod), [], Opts1, StartOpts));
- {undefined,Suite,GsAndCs} when is_atom(Suite) and
- (Suite /= undefined) ->
+ {undefined,Suite,GsAndCs} when is_atom(Suite),
+ Suite /= undefined ->
{Dir,Mod} = suite_to_test(Suite),
reformat_result(catch do_run(tests(Dir, Mod, GsAndCs),
[], Opts1, StartOpts));
@@ -1301,9 +1299,9 @@ run_dir(Opts = #opts{logdir = LogDir,
{undefined,[Hd,_|_],_GsAndCs} when not is_integer(Hd) ->
exit({error,multiple_suites_and_cases});
- {undefined,Suite=[Hd|Tl],GsAndCs} when is_integer(Hd) ;
- (is_list(Hd) and (Tl == [])) ;
- (is_atom(Hd) and (Tl == [])) ->
+ {undefined,Suite=[Hd|Tl],GsAndCs} when is_integer(Hd);
+ is_list(Hd), Tl == [];
+ is_atom(Hd), Tl == [] ->
{Dir,Mod} = suite_to_test(Suite),
reformat_result(catch do_run(tests(Dir, Mod, GsAndCs),
[], Opts1, StartOpts));
@@ -1314,19 +1312,19 @@ run_dir(Opts = #opts{logdir = LogDir,
{undefined,undefined,GsAndCs} when GsAndCs /= [] ->
exit({error,incorrect_start_options});
- {Dir,Suite,GsAndCs} when is_integer(hd(Dir)) ;
- (is_atom(Dir) and (Dir /= undefined)) ;
- ((length(Dir) == 1) and is_atom(hd(Dir))) ;
- ((length(Dir) == 1) and is_list(hd(Dir))) ->
+ {Dir,Suite,GsAndCs} when is_integer(hd(Dir));
+ is_atom(Dir), Dir /= undefined;
+ is_atom(hd(Dir)), length(Dir) == 1;
+ is_list(hd(Dir)), length(Dir) == 1 ->
Dir1 = if is_atom(Dir) -> atom_to_list(Dir);
true -> Dir end,
if Suite == undefined ->
exit({error,incorrect_start_options});
- is_integer(hd(Suite)) ;
- (is_atom(Suite) and (Suite /= undefined)) ;
- ((length(Suite) == 1) and is_atom(hd(Suite))) ;
- ((length(Suite) == 1) and is_list(hd(Suite))) ->
+ is_integer(hd(Suite));
+ is_atom(Suite), Suite /= undefined;
+ is_atom(hd(Suite)), length(Suite) == 1;
+ is_list(hd(Suite)), length(Suite) == 1 ->
{Dir2,Mod} = suite_to_test(Dir1, Suite),
case GsAndCs of
[] ->
@@ -1612,11 +1610,11 @@ suite_to_test(Dir, Suite) when is_list(Suite) ->
{DirName,list_to_atom(filename:rootname(File))}
end.
-groups_and_cases(Gs, Cs) when ((Gs == undefined) or (Gs == [])) and
- ((Cs == undefined) or (Cs == [])) ->
+groups_and_cases(Gs, Cs) when Gs == undefined orelse Gs == [],
+ Cs == undefined orelse Cs == [] ->
[];
groups_and_cases(Gs, Cs) when Gs == undefined ; Gs == [] ->
- if (Cs == all) or (Cs == [all]) or (Cs == ["all"]) -> all;
+ if Cs == all; Cs == [all]; Cs == ["all"] -> all;
true -> [ensure_atom(C) || C <- listify(Cs)]
end;
groups_and_cases(GOrGs, Cs) when (is_atom(GOrGs) orelse
@@ -1624,8 +1622,8 @@ groups_and_cases(GOrGs, Cs) when (is_atom(GOrGs) orelse
(is_atom(hd(GOrGs)) orelse
(is_list(hd(GOrGs)) andalso
is_atom(hd(hd(GOrGs))))))) ->
- if (Cs == undefined) or (Cs == []) or
- (Cs == all) or (Cs == [all]) or (Cs == ["all"]) ->
+ if Cs == undefined; Cs == [];
+ Cs == all; Cs == [all]; Cs == ["all"] ->
[{GOrGs,all}];
true ->
[{GOrGs,[ensure_atom(C) || C <- listify(Cs)]}]
@@ -1634,7 +1632,7 @@ groups_and_cases(Gs, Cs) when is_integer(hd(hd(Gs))) ->
%% if list of strings, this comes from 'ct_run -group G1 G2 ...' and
%% we need to parse the strings
Gs1 =
- if (Gs == [all]) or (Gs == ["all"]) ->
+ if Gs == [all]; Gs == ["all"] ->
all;
true ->
lists:map(fun(G) ->
@@ -2362,7 +2360,7 @@ start_cover(Opts=#opts{coverspec=CovData,cover_stop=CovStop},LogDir) ->
[TsCoverInfo]),
%% start cover on specified nodes
- if (CovNodes /= []) and (CovNodes /= undefined) ->
+ if CovNodes /= [], CovNodes /= undefined ->
ct_logs:log("COVER INFO",
"Nodes included in cover "
"session: ~tw",
diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl
index 09e1fd890e..22254ee667 100644
--- a/lib/common_test/src/ct_slave.erl
+++ b/lib/common_test/src/ct_slave.erl
@@ -352,7 +350,7 @@ do_start(Host, Node, Options) ->
{ok, ENode}->
ok;
{error, Timeout, ENode}
- when ((Timeout==init_timeout) or (Timeout==startup_timeout)) and
+ when Timeout==init_timeout orelse Timeout==startup_timeout,
Options#options.kill_if_fail->
do_stop(ENode);
_-> ok
diff --git a/lib/common_test/src/ct_telnet.erl b/lib/common_test/src/ct_telnet.erl
index c7c393d6ab..af1959ed33 100644
--- a/lib/common_test/src/ct_telnet.erl
+++ b/lib/common_test/src/ct_telnet.erl
@@ -1192,7 +1190,7 @@ teln_expect(Name,Pid,Data,Pattern0,Prx,Opts) ->
end.
convert_pattern(Pattern0,Seq)
- when Pattern0==[] orelse (is_list(Pattern0) and not is_integer(hd(Pattern0))) ->
+ when Pattern0==[]; is_list(Pattern0), not is_integer(hd(Pattern0)) ->
Pattern =
case Seq of
true -> Pattern0;
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl
index 14bbeb286e..329167871d 100644
--- a/lib/common_test/src/ct_testspec.erl
+++ b/lib/common_test/src/ct_testspec.erl
@@ -476,10 +474,10 @@ replace_names(Terms) ->
throw({illegal_name_in_testspec,Name});
true ->
[First|_] = atom_to_list(Name),
- if ((First == $?) or (First == $$)
- or (First == $_)
- or ((First >= $A)
- and (First =< $Z))) ->
+ if First == $?;
+ First == $$;
+ First == $_;
+ First >= $A andalso First =< $Z ->
[Def];
true ->
throw({illegal_name_in_testspec,
@@ -1301,14 +1299,14 @@ insert_groups(Node,Dir,Suite,Group,Cases,Tests,MergeTests)
when is_atom(Group); is_tuple(Group) ->
insert_groups(Node,Dir,Suite,[Group],Cases,Tests,MergeTests);
insert_groups(Node,Dir,Suite,Groups,Cases,Tests,false) when
- ((Cases == all) or is_list(Cases)) and is_list(Groups) ->
+ Cases == all orelse is_list(Cases), is_list(Groups) ->
Groups1 = [if is_list(Gr) -> % preserve group path
{[Gr],Cases};
true ->
{Gr,Cases} end || Gr <- Groups],
append({{Node,Dir},[{Suite,Groups1}]},Tests);
insert_groups(Node,Dir,Suite,Groups,Cases,Tests,true) when
- ((Cases == all) or is_list(Cases)) and is_list(Groups) ->
+ Cases == all orelse is_list(Cases), is_list(Groups) ->
Groups1 = [if is_list(Gr) -> % preserve group path
{[Gr],Cases};
true ->
@@ -1420,11 +1418,11 @@ skip_groups(Node,Dir,Suite,Groups,Case,Cmt,Tests,MergeTests)
when is_atom(Case),Case =/= all ->
skip_groups(Node,Dir,Suite,Groups,[Case],Cmt,Tests,MergeTests);
skip_groups(Node,Dir,Suite,Groups,Cases,Cmt,Tests,false) when
- ((Cases == all) or is_list(Cases)) and is_list(Groups) ->
+ Cases == all orelse is_list(Cases), is_list(Groups) ->
Suites1 = skip_groups1(Suite,[{Gr,Cases} || Gr <- Groups],Cmt,[]),
append({{Node,Dir},Suites1},Tests);
skip_groups(Node,Dir,Suite,Groups,Cases,Cmt,Tests,true) when
- ((Cases == all) or is_list(Cases)) and is_list(Groups) ->
+ Cases == all orelse is_list(Cases), is_list(Groups) ->
{Tests1,Done} =
lists:foldr(fun({{N,D},Suites0},{Merged,_}) when N == Node,
D == Dir ->
@@ -1581,7 +1579,7 @@ is_node([master|_],_Nodes) ->
is_node(What={N,H},Nodes) when is_atom(N), is_atom(H) ->
is_node([What],Nodes);
is_node([What|_],Nodes) ->
- case lists:keymember(What,1,Nodes) or
+ case lists:keymember(What,1,Nodes) orelse
lists:keymember(What,2,Nodes) of
true ->
true;
diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl
index 47251e2832..40612575b9 100644
--- a/lib/common_test/src/test_server_ctrl.erl
+++ b/lib/common_test/src/test_server_ctrl.erl
@@ -2352,15 +2350,15 @@ run_test_cases(TestSpec, Config, TimetrapData) ->
run_test_cases_loop([{SkipTag,CaseData={Type,_Ref,_Case,_Comment}}|Cases],
Config, TimetrapData, Mode, Status) when
- ((SkipTag==auto_skip_case) or (SkipTag==skip_case)) and
- ((Type==conf) or (Type==make)) ->
+ SkipTag==auto_skip_case orelse SkipTag==skip_case,
+ Type==conf orelse Type==make ->
run_test_cases_loop([{SkipTag,CaseData,Mode}|Cases],
Config, TimetrapData, Mode, Status);
run_test_cases_loop([{SkipTag,{Type,Ref,Case,Comment},SkipMode}|Cases],
Config, TimetrapData, Mode, Status) when
- ((SkipTag==auto_skip_case) or (SkipTag==skip_case)) and
- ((Type==conf) or (Type==make)) ->
+ SkipTag==auto_skip_case orelse SkipTag==skip_case,
+ Type==conf orelse Type==make ->
ok = file:set_cwd(filename:dirname(get(test_server_dir))),
CurrIOHandler = get(test_server_common_io_handler),
ParentMode = tl(Mode),
@@ -2825,7 +2823,7 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
stop_minor_log_file(),
run_test_cases_loop(Cases2, Config1, TimetrapData, Mode, Status3);
- {_,{Skip,Reason},_} when StartConf and ((Skip==skip) or (Skip==skipped)) ->
+ {_,{Skip,Reason},_} when StartConf, Skip==skip orelse Skip==skipped ->
ReportAbortRepeat(skipped),
print(minor, "~n*** ~tw skipped.~n"
" Skipping all cases.", [Func]),
--
2.51.0
