Skip to content

Commit 81a5ae8

Browse files
committed
fix(build): report and fail on errors
tree benchmark was broken and we didn’t know it… also changes reporting to not include messages from `console.time()`, …
1 parent 733915d commit 81a5ae8

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ var _HTLM_DEFAULT_SCRIPTS_JS = [
4343
{src: '../../extension-register.js', mimeType: 'text/javascript'},
4444
{src: '../../runtime_paths.js', mimeType: 'text/javascript'},
4545
{
46-
inline: 'System.import(\'$MODULENAME$\').then(function(m) { m.main(); }, console.log.bind(console))',
46+
inline: 'System.import(\'$MODULENAME$\').then(function(m) { m.main(); }, console.error.bind(console))',
4747
mimeType: 'text/javascript'
4848
}
4949
];

modules/angular2/src/test_lib/e2e_util.es6

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ function verifyNoBrowserErrors() {
1717
browser.executeScript('1+1');
1818
browser.manage().logs().get('browser').then(function(browserLog) {
1919
var filteredLog = browserLog.filter(function(logEntry) {
20-
console.log('>> ' + require('util').inspect(logEntry));
20+
if (logEntry.level.value >= webdriver.logging.Level.INFO.value) {
21+
console.log('>> ' + logEntry.message);
22+
}
2123
return logEntry.level.value > webdriver.logging.Level.WARNING.value;
2224
});
2325
expect(filteredLog.length).toEqual(0);

modules/benchmarks/src/tree/tree_benchmark.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,20 @@ function setupReflector() {
189189
});
190190
}
191191

192+
var BASELINE_TREE_TEMPLATE;
193+
var BASELINE_IF_TEMPLATE;
194+
192195
export function main() {
193196
BrowserDomAdapter.makeCurrent();
194197
var maxDepth = getIntParameter('depth');
195198

196199
setupReflector();
197200

201+
BASELINE_TREE_TEMPLATE = DOM.createTemplate(
202+
'<span>_<template class="ng-binding"></template><template class="ng-binding"></template></span>');
203+
BASELINE_IF_TEMPLATE = DOM.createTemplate(
204+
'<span template="if"><tree></tree></span>');
205+
198206
var app;
199207
var lifeCycle;
200208
var baselineRootTreeComponent;
@@ -306,10 +314,6 @@ function buildTree(maxDepth, values, curDepth) {
306314
buildTree(maxDepth, values, curDepth+1));
307315
}
308316

309-
var BASELINE_TREE_TEMPLATE = DOM.createTemplate(
310-
'<span>_<template class="ng-binding"></template><template class="ng-binding"></template></span>');
311-
var BASELINE_IF_TEMPLATE = DOM.createTemplate(
312-
'<span template="if"><tree></tree></span>');
313317
// http://jsperf.com/nextsibling-vs-childnodes
314318

315319
class BaseLineTreeComponent {

0 commit comments

Comments
 (0)