Skip to content

Commit

Permalink
Get benchmarks working again
Browse files Browse the repository at this point in the history
  • Loading branch information
@davedoesdev
davedoesdev committed Aug 31, 2020
1 parent 32ea7d2 commit a9cfa45
Show file tree
Hide file tree
Showing 30 changed files with 508 additions and 268 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ before_install:
- sudo apt update
- sudo apt -y install libboost1.70-dev g++-9
script:
- if [ $TRAVIS_NODE_VERSION = 13 ]; then npm run coverage && npm run coveralls; else npm run test; fi
- if [ $TRAVIS_NODE_VERSION = 14 ]; then npm run coverage && npm run coveralls; else npm run test; fi
2 changes: 1 addition & 1 deletion bench/add_many.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*jslint node: true */
"use strict";

var qlobber = require('..'),
var qlobber = require('..').set_native(require('../native')),
util = require("util");

module.exports = function ()
Expand Down
2 changes: 1 addition & 1 deletion bench/add_shortcut_many.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*jslint node: true */
"use strict";

var qlobber = require('..'),
var qlobber = require('..').set_native(require('../native')),
util = require("util");

module.exports = function ()
Expand Down
2 changes: 1 addition & 1 deletion bench/common/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"use strict";

var assert = require('assert');
var qlobber = require('../..');
var qlobber = require('../..').set_native(require('../../native'));
var MapValQlobber = require('../options/_mapval').MapValQlobber;
var expect = require('chai').expect;
require('../../test/rabbitmq.js');
Expand Down
2 changes: 1 addition & 1 deletion bench/match.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*jslint node: true */
"use strict";

var qlobber = require('..'),
var qlobber = require('..').set_native(require('../native')),
MapValQlobber = require('./options/_mapval').MapValQlobber,
common = require('./common');

Expand Down
2 changes: 1 addition & 1 deletion bench/match_many.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*jslint node: true */
"use strict";

var qlobber = require('..'),
var qlobber = require('..').set_native(require('../native')),
MapValQlobber = require('./options/_mapval').MapValQlobber,
common = require('./common');

Expand Down
2 changes: 1 addition & 1 deletion bench/match_search.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*jslint node: true */
"use strict";

var qlobber = require('..'),
var qlobber = require('..').set_native(require('../native')),
MapValQlobber = require('./options/_mapval').MapValQlobber,
common = require('./common');

Expand Down
2 changes: 1 addition & 1 deletion bench/match_search_many.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"use strict";

var assert = require('assert'),
qlobber = require('..'),
qlobber = require('..').set_native(require('../native')),
MapValQlobber = require('./options/_mapval').MapValQlobber;

var matcher_options = {
Expand Down
2 changes: 1 addition & 1 deletion bench/options/check-dedup-native.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*jslint node: true */

var qlobber = require('../..');
var qlobber = require('../..').set_native(require('../../native'));

module.exports = {
Matcher: qlobber.QlobberDedup.nativeString,
Expand Down
2 changes: 1 addition & 1 deletion bench/options/check-default-native.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*jslint node: true */

var qlobber = require('../..');
var qlobber = require('../..').set_native(require('../../native'));

module.exports = {
Matcher: qlobber.Qlobber.nativeString,
Expand Down
2 changes: 1 addition & 1 deletion bench/options/dedup-native.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*jslint node: true */

var qlobber = require('../..');
var qlobber = require('../..').set_native(require('../../native'));

module.exports = {
Matcher: qlobber.QlobberDedup.nativeString,
Expand Down
2 changes: 1 addition & 1 deletion bench/options/default-native.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*jslint node: true */

var qlobber = require('../..');
var qlobber = require('../..').set_native(require('../../native'));

module.exports = {
Matcher: qlobber.Qlobber.nativeString,
Expand Down
2 changes: 1 addition & 1 deletion bench/test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*jslint node: true */
"use strict";

var qlobber = require('..'),
var qlobber = require('..').set_native(require('../native')),
MapValQlobber = require('./options/_mapval').MapValQlobber,
common = require('./common');

Expand Down
2 changes: 1 addition & 1 deletion bench/test_many.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"use strict";

var assert = require('assert'),
qlobber = require('..'),
qlobber = require('..').set_native(require('../native')),
MapValQlobber = require('./options/_mapval').MapValQlobber;

var matcher_options = {
Expand Down
14 changes: 7 additions & 7 deletions coverage/lcov-report/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ <h1>All files</h1>
<div class='fl pad1y space-right2'>
<span class="strong">100% </span>
<span class="quiet">Statements</span>
<span class='fraction'>413/413</span>
<span class='fraction'>416/416</span>
</div>


<div class='fl pad1y space-right2'>
<span class="strong">100% </span>
<span class="quiet">Branches</span>
<span class='fraction'>198/198</span>
<span class='fraction'>200/200</span>
</div>


Expand All @@ -46,7 +46,7 @@ <h1>All files</h1>
<div class='fl pad1y space-right2'>
<span class="strong">100% </span>
<span class="quiet">Lines</span>
<span class='fraction'>412/412</span>
<span class='fraction'>415/415</span>
</div>


Expand Down Expand Up @@ -108,13 +108,13 @@ <h1>All files</h1>
<div class="chart"><div class="cover-fill cover-full" style="width: 100%"></div><div class="cover-empty" style="width: 0%"></div></div>
</td>
<td data-value="100" class="pct high">100%</td>
<td data-value="359" class="abs high">359/359</td>
<td data-value="362" class="abs high">362/362</td>
<td data-value="100" class="pct high">100%</td>
<td data-value="183" class="abs high">183/183</td>
<td data-value="185" class="abs high">185/185</td>
<td data-value="100" class="pct high">100%</td>
<td data-value="59" class="abs high">59/59</td>
<td data-value="100" class="pct high">100%</td>
<td data-value="358" class="abs high">358/358</td>
<td data-value="361" class="abs high">361/361</td>
</tr>

<tr>
Expand All @@ -140,7 +140,7 @@ <h1>All files</h1>
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
at Mon Aug 10 2020 22:04:21 GMT+0100 (British Summer Time)
at Mon Aug 31 2020 08:25:27 GMT+0100 (British Summer Time)
</div>
</div>
<script src="prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/qlobber/aedes/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ <h1><a href="../../index.html">All files</a> qlobber/aedes</h1>
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
at Mon Aug 10 2020 22:04:21 GMT+0100 (British Summer Time)
at Mon Aug 31 2020 08:25:27 GMT+0100 (British Summer Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/qlobber/aedes/qlobber-sub.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">qlobber/aede
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
at Mon Aug 10 2020 22:04:21 GMT+0100 (British Summer Time)
at Mon Aug 31 2020 08:25:27 GMT+0100 (British Summer Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/qlobber/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ <h1><a href="../index.html">All files</a> qlobber</h1>
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
at Mon Aug 10 2020 22:04:21 GMT+0100 (British Summer Time)
at Mon Aug 31 2020 08:25:27 GMT+0100 (British Summer Time)
</div>
</div>
<script src="../prettify.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/qlobber/index.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">qlobber</a> ind
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
at Mon Aug 10 2020 22:04:21 GMT+0100 (British Summer Time)
at Mon Aug 31 2020 08:25:27 GMT+0100 (British Summer Time)
</div>
</div>
<script src="../prettify.js"></script>
Expand Down
14 changes: 7 additions & 7 deletions coverage/lcov-report/qlobber/lib/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ <h1><a href="../../index.html">All files</a> qlobber/lib</h1>
<div class='fl pad1y space-right2'>
<span class="strong">100% </span>
<span class="quiet">Statements</span>
<span class='fraction'>359/359</span>
<span class='fraction'>362/362</span>
</div>


<div class='fl pad1y space-right2'>
<span class="strong">100% </span>
<span class="quiet">Branches</span>
<span class='fraction'>183/183</span>
<span class='fraction'>185/185</span>
</div>


Expand All @@ -46,7 +46,7 @@ <h1><a href="../../index.html">All files</a> qlobber/lib</h1>
<div class='fl pad1y space-right2'>
<span class="strong">100% </span>
<span class="quiet">Lines</span>
<span class='fraction'>358/358</span>
<span class='fraction'>361/361</span>
</div>


Expand Down Expand Up @@ -78,13 +78,13 @@ <h1><a href="../../index.html">All files</a> qlobber/lib</h1>
<div class="chart"><div class="cover-fill cover-full" style="width: 100%"></div><div class="cover-empty" style="width: 0%"></div></div>
</td>
<td data-value="100" class="pct high">100%</td>
<td data-value="307" class="abs high">307/307</td>
<td data-value="310" class="abs high">310/310</td>
<td data-value="100" class="pct high">100%</td>
<td data-value="175" class="abs high">175/175</td>
<td data-value="177" class="abs high">177/177</td>
<td data-value="100" class="pct high">100%</td>
<td data-value="48" class="abs high">48/48</td>
<td data-value="100" class="pct high">100%</td>
<td data-value="306" class="abs high">306/306</td>
<td data-value="309" class="abs high">309/309</td>
</tr>

<tr>
Expand All @@ -110,7 +110,7 @@ <h1><a href="../../index.html">All files</a> qlobber/lib</h1>
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
at Mon Aug 10 2020 22:04:21 GMT+0100 (British Summer Time)
at Mon Aug 31 2020 08:25:27 GMT+0100 (British Summer Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
62 changes: 40 additions & 22 deletions coverage/lcov-report/qlobber/lib/qlobber.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">qlobber/lib<
<div class='fl pad1y space-right2'>
<span class="strong">100% </span>
<span class="quiet">Statements</span>
<span class='fraction'>307/307</span>
<span class='fraction'>310/310</span>
</div>


<div class='fl pad1y space-right2'>
<span class="strong">100% </span>
<span class="quiet">Branches</span>
<span class='fraction'>175/175</span>
<span class='fraction'>177/177</span>
</div>


Expand All @@ -46,7 +46,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">qlobber/lib<
<div class='fl pad1y space-right2'>
<span class="strong">100% </span>
<span class="quiet">Lines</span>
<span class='fraction'>306/306</span>
<span class='fraction'>309/309</span>
</div>


Expand Down Expand Up @@ -1152,7 +1152,13 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">qlobber/lib<
<a name='L1093'></a><a href='#L1093'>1093</a>
<a name='L1094'></a><a href='#L1094'>1094</a>
<a name='L1095'></a><a href='#L1095'>1095</a>
<a name='L1096'></a><a href='#L1096'>1096</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
<a name='L1096'></a><a href='#L1096'>1096</a>
<a name='L1097'></a><a href='#L1097'>1097</a>
<a name='L1098'></a><a href='#L1098'>1098</a>
<a name='L1099'></a><a href='#L1099'>1099</a>
<a name='L1100'></a><a href='#L1100'>1100</a>
<a name='L1101'></a><a href='#L1101'>1101</a>
<a name='L1102'></a><a href='#L1102'>1102</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -2211,6 +2217,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">qlobber/lib<
<span class="cline-any cline-yes">196x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">15x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand All @@ -2227,12 +2234,17 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">qlobber/lib<
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">19x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">19x</span>
<span class="cline-any cline-yes">19x</span>
<span class="cline-any cline-yes">19x</span>
<span class="cline-any cline-yes">19x</span>
<span class="cline-any cline-yes">19x</span>
<span class="cline-any cline-yes">19x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">15x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">15x</span>
<span class="cline-any cline-yes">15x</span>
<span class="cline-any cline-yes">15x</span>
<span class="cline-any cline-yes">15x</span>
<span class="cline-any cline-yes">15x</span>
<span class="cline-any cline-yes">15x</span>
<span class="cline-any cline-yes">15x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -3306,6 +3318,8 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">qlobber/lib<
cb();
};
&nbsp;
let native_module = null;
&nbsp;
/**
Add [qlobber-native](https://www.npmjs.com/package/qlobber-native) to qlobber.
&nbsp;
Expand All @@ -3319,18 +3333,22 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">qlobber/lib<
*/
function set_native(qlobber_native)
{
// wrap_native.js uses 'async *' which isn't available on Node 8
try
{
const wrap_native = require('./wrap_native.js');
Qlobber.nativeString = wrap_native(qlobber_native.QlobberString, Qlobber);
Qlobber.nativeNumber = wrap_native(qlobber_native.QlobberNumber, Qlobber);
QlobberDedup.nativeString = wrap_native(qlobber_native.QlobberDedupString, QlobberDedup);
QlobberDedup.nativeNumber = wrap_native(qlobber_native.QlobberDedupNumber, QlobberDedup);
QlobberTrue.native = wrap_native(qlobber_native.QlobberTrue, QlobberTrue);
}
catch (ex)
if (qlobber_native !== native_module)
{
// wrap_native.js uses 'async *' which isn't available on Node 8
try
{
const wrap_native = require('./wrap_native.js');
Qlobber.nativeString = wrap_native(qlobber_native.QlobberString, Qlobber);
Qlobber.nativeNumber = wrap_native(qlobber_native.QlobberNumber, Qlobber);
QlobberDedup.nativeString = wrap_native(qlobber_native.QlobberDedupString, QlobberDedup);
QlobberDedup.nativeNumber = wrap_native(qlobber_native.QlobberDedupNumber, QlobberDedup);
QlobberTrue.native = wrap_native(qlobber_native.QlobberTrue, QlobberTrue);
native_module = qlobber_native;
}
catch (ex)
{
}
}
&nbsp;
return exports;
Expand All @@ -3349,7 +3367,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">qlobber/lib<
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
at Mon Aug 10 2020 22:04:21 GMT+0100 (British Summer Time)
at Mon Aug 31 2020 08:25:27 GMT+0100 (British Summer Time)
</div>
</div>
<script src="../../prettify.js"></script>
Expand Down
Loading

0 comments on commit a9cfa45

Please sign in to comment.