Skip to content

Commit

Permalink
fix(benchpress): fix issues with benchmarks
Browse files Browse the repository at this point in the history
Some benchmarks had errors that were causing perf tests to log 0:00 time
values for scriptTime metrics.

Fixed Issues:
 - Was using Rx.js instead of Rx.umd.js in all benchmarks
 - Was calling mergeMap on Rx2 observable instead of flatMap
 - Had mis-named variables in mergeAll spec
  • Loading branch information
jeffbcross authored and benlesh committed Feb 10, 2016
1 parent 7bae860 commit 16894bb
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion perf/macro/bufferCount/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>RxJS 3 Perf Tests</title>
<script src="../../../dist/global/Rx.js"></script>
<script src="../../../dist/global/Rx.umd.js"></script>
<script type="text/javascript">
window.RxNext = window.Rx;
window.Rx = void 0;
Expand Down
2 changes: 1 addition & 1 deletion perf/macro/combineLatest/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>RxJS 3 Perf Tests</title>
<script src="../../../dist/global/Rx.js"></script>
<script src="../../../dist/global/Rx.umd.js"></script>
<script type="text/javascript">
window.RxNext = window.Rx;
window.Rx = void 0;
Expand Down
2 changes: 1 addition & 1 deletion perf/macro/groupBy/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>RxJS 3 Perf Tests</title>
<script src="../../../dist/global/Rx.js"></script>
<script src="../../../dist/global/Rx.umd.js"></script>
<script type="text/javascript">
window.RxNext = window.Rx;
window.Rx = void 0;
Expand Down
2 changes: 1 addition & 1 deletion perf/macro/merge/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>RxJS 3 Perf Tests</title>
<script src="../../../dist/global/Rx.js"></script>
<script src="../../../dist/global/Rx.umd.js"></script>
<script type="text/javascript">
window.RxNext = window.Rx;
window.Rx = void 0;
Expand Down
2 changes: 1 addition & 1 deletion perf/macro/mergeAll/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>RxJS 3 Perf Tests</title>
<script src="../../../dist/global/Rx.js"></script>
<script src="../../../dist/global/Rx.umd.js"></script>
<script type="text/javascript">
window.RxNext = window.Rx;
window.Rx = void 0;
Expand Down
4 changes: 2 additions & 2 deletions perf/macro/mergeAll/perf.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ var Rx2TestObservable = Rx.Observable.range(0, numIterations)
var RxNextTestObservable = RxNext.Observable.range(0, numIterations)
.map(function (x) { return RxNext.Observable.range(0, numIterations); });

Rx2Merge.addEventListener('click', function () {
Rx2MergeAll.addEventListener('click', function () {
Rx2TestObservable.mergeAll().subscribe();
});

RxNextMerge.addEventListener('click', function () {
RxNextMergeAll.addEventListener('click', function () {
RxNextTestObservable.mergeAll().subscribe();
});
2 changes: 1 addition & 1 deletion perf/macro/mergeMap-scalar/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>RxJS 3 Perf Tests</title>
<script src="../../../dist/global/Rx.js"></script>
<script src="../../../dist/global/Rx.umd.js"></script>
<script type="text/javascript">
window.RxNext = window.Rx;
window.Rx = void 0;
Expand Down
2 changes: 1 addition & 1 deletion perf/macro/mergeMap/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>RxJS 3 Perf Tests</title>
<script src="../../../dist/global/Rx.js"></script>
<script src="../../../dist/global/Rx.umd.js"></script>
<script type="text/javascript">
window.RxNext = window.Rx;
window.Rx = void 0;
Expand Down
2 changes: 1 addition & 1 deletion perf/macro/mergeMap/perf.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ RxNextMergeMap.addEventListener('click', function () {
});

Rx2MergeMap.addEventListener('click', function () {
Rx2TestObservable.mergeMap(projectionRx2).subscribe();
Rx2TestObservable.flatMap(projectionRx2).subscribe();
});

2 changes: 1 addition & 1 deletion perf/macro/windowCount/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>RxJS 3 Perf Tests</title>
<script src="../../../dist/global/Rx.js"></script>
<script src="../../../dist/global/Rx.umd.js"></script>
<script type="text/javascript">
window.RxNext = window.Rx;
window.Rx = void 0;
Expand Down
2 changes: 1 addition & 1 deletion perf/macro/zip/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>RxJS 3 Perf Tests</title>
<script src="../../../dist/global/Rx.js"></script>
<script src="../../../dist/global/Rx.umd.js"></script>
<script type="text/javascript">
window.RxNext = window.Rx;
window.Rx = void 0;
Expand Down

0 comments on commit 16894bb

Please sign in to comment.