Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-14132] Fleshed out some report wording/formatting #219

Merged
merged 1 commit into from
Jun 6, 2013
Merged

[TIMOB-14132] Fleshed out some report wording/formatting #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions commands/analyze.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,16 +308,16 @@ function runFromCLIParameters(logger, config, cli) {

// Parse the config options
options = {};
options.invokeMethods = !argv['no-method-invokation'];
options.evaluateLoops = !argv['no-loop-evaluation'];
options.invokeMethods = argv['method-invokation'] !== false;
options.evaluateLoops = argv['loop-evaluation'] !== false;
options.maxLoopIterations = parseInt(argv['max-loop-iterations'], 10);
options.maxRecursionLimit = parseInt(argv['max-recursion-limit'], 10);
options.cycleDetectionStackSize = parseInt(argv['cycle-detection-stack-size'], 10);
options.maxCycles = parseInt(argv['max-cycles'], 10);
options.logConsoleCalls = !argv['no-console-passthrough'];
options.logConsoleCalls = argv['console-passthrough'] !== false;
options.executionTimeLimit = parseInt(argv['execution-time-limit'], 10);
options.exactMode = argv['exact-mode'];
options.nativeExceptionRecovery = !argv['no-native-exception-recovery'];
options.nativeExceptionRecovery = argv['native-exception-recovery'] !== false;
options.processUnvisitedCode = argv['process-unvisited-code'];
options.resultsPath = argv['results-dir'];

Expand Down
4 changes: 2 additions & 2 deletions lib/CodeProcessor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,7 @@ function generateResultsPages(outputFormat, resultsDirectory, theme, callback) {
numErrors = results.errors.length;
numWarnings = results.warnings.length;
if (numErrors || numWarnings) {
errorsAndWarnings = '';
errorsAndWarnings = '\n';
if (numErrors) {
errorsAndWarnings += pluralize('%s error ', '%s errors ', numErrors);
if (numWarnings) {
Expand Down Expand Up @@ -1064,7 +1064,7 @@ function generateResultsPages(outputFormat, resultsDirectory, theme, callback) {
'******************************************\n\n';

resultsToLog += 'Analysis completed in ' + data.elapsedTime + ' seconds at ' + data.time + ' on ' + data.date +
(data.errorsAndWarnings ? '\n' + data.errorsAndWarnings : '') + '\n';
(data.errorsAndWarnings ? data.errorsAndWarnings : '') + '\n';
if (elevatedPluginList && elevatedPluginList.length) {
for (i = 0, len = elevatedPluginList.length; i < len; i++) {
resultsToLog += elevatedPluginList[i].name + ': ' + elevatedPluginList[i].overview + '\n';
Expand Down
3 changes: 1 addition & 2 deletions templates/summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
</div>
<div class="container-fluid">
<h3>Overview</h3>
<pre>Analysis completed in {{elapsedTime}} seconds at {{time}} on {{date}}
{{errorsAndWarnings}}{{#elevatedPlugins}}
<pre>Analysis completed in {{elapsedTime}} seconds at {{time}} on {{date}}{{errorsAndWarnings}}{{#elevatedPlugins}}
{{name}}: {{overview}}{{/elevatedPlugins}}</pre>
<h3>Options</h3>
<table class="table table-striped table-bordered">
Expand Down