Skip to content
Snippets Groups Projects
Commit bff7f955 authored by Olivier Sauter's avatar Olivier Sauter
Browse files

clean up nverbose to have fewer write when skipping, add nverbose 11,12 options

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@11774 d63d8f72-b253-0410-a779-e742ad2e26cf
parent b6d51716
No related branches found
No related tags found
No related merge requests found
......@@ -8,7 +8,7 @@ function [pass,request_list,err,telaps,skipped,gdat_results] = test_all_requestn
% INPUT PARAMETERS (optional)
% machine: string of machine name (e.g. 'aug'). (default: gdat internal default)
% testmode: depth of test: 'reduced' or 'full' (default: 'reduced') or cell array of requests to test
% nverbose: 0 for silent, 1 for text, 2 for plots (default: 1)
% nverbose: 0 for silent, 1/11 for text, 2/12 for plots (default: 1) 1/2 will not write skipped signals, calling..., 11/12 will write all
% OUTPUTS
% pass: single boolean indicating pass/fail of test
% pass means all error codes were zero
......@@ -16,11 +16,15 @@ function [pass,request_list,err,telaps,skipped,gdat_results] = test_all_requestn
% err: error code of tested requests
% telaps: elapsed time for tested requests
% skipped: boolean flag indicating whether request was skipped
%
% Example for quick test:
% [pass,request_list,err,telaps,skipped,gdat_results] = test_all_requestnames('machine','tcv','testmode',{'ip','q_rho'});
%
[machine,testmode,nverbose] = parse_inputs(varargin{:});
%
if nverbose>=2
if nverbose>=2 && nverbose ~= 11
doplot = true;
else
doplot = false;
......@@ -48,6 +52,14 @@ end
%% possibly skip some since they take too long for a reduced test
if iscell(testmode)
skip = setdiff(request_list,testmode);
testmode_not_in_list = setdiff(testmode,request_list);
if ~isempty(testmode_not_in_list)
if nverbose >= 1
disp('***********************************************************************')
warning(['following input requests nt in request_list: ' testmode_not_in_list{:}]);
disp('***********************************************************************')
end
end
else
switch testmode
case 'reduced'
......@@ -88,7 +100,7 @@ for ireq = 1:Nreq
err(ireq) = 0;
telaps(ireq) = 0;
skipped(ireq) = true;
if nverbose>=1; fprintf('\n skipping gdat request ''%s''\n',myrequest); end
if nverbose>=11; fprintf('\n skipping gdat request ''%s''\n',myrequest); end
end
end
......@@ -96,7 +108,7 @@ pass = all(~err);
%% Summary display
if nverbose
summary_display(request_list,telaps,err,gdat_call,skipped)
summary_display(request_list,telaps,err,gdat_call,skipped,nverbose)
if pass
fprintf('passed %s tests\n',mfilename());
......@@ -126,7 +138,7 @@ switch upper(machine)
end
function [err,telaps,gdat_result] = do_gdat_call(gdat_call,nverbose)
if nverbose
if nverbose >= 11
fprintf('\n calling %s...\n',gdat_call);
end
......@@ -140,7 +152,7 @@ catch ME
end
telaps = toc; % elapsed time
function summary_display(request_list,telaps,err,gdat_call,skipped)
function summary_display(request_list,telaps,err,gdat_call,skipped,nverbose)
%%
Nreq = numel(request_list);
......@@ -154,7 +166,7 @@ if any(err==0)
end
end
if any(skipped)
if any(skipped) && nverbose >= 11
fprintf('\n\n SKIPPED:\n')
print_header();
for ireq=1:Nreq
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment