diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c84c537..9ad7849 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -14,4 +14,4 @@ jobs: with: node-version: ${{ matrix.node-version }} - run: npm i - - run: npm test + - run: npm run nyc_mocha_wasm diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 1256879..8a33139 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -14,4 +14,4 @@ jobs: with: node-version: ${{ matrix.node-version }} - run: npm i - - run: npm test + - run: npm run nyc_mocha_wasm diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b95e8b3..c160d11 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -14,4 +14,4 @@ jobs: with: node-version: ${{ matrix.node-version }} - run: npm i - - run: npm test + - run: npm run nyc_mocha_wasm diff --git a/package.json b/package.json index 0ed9d84..9bf5e8d 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "watch": "mocha --watch", "build.web": "browserify ./lib/vcd-web.js | terser --compress -o demo/vcd-web.min.js", "watch.web": "watchify ./lib/vcd-web.js -o demo/vcd-web.min.js -v", - "install": "node bin/build.js", "prepare": "node bin/build.js" }, "files": [ diff --git a/test/wasm_any.js b/test/wasm_any.js index bf2220b..985dfba 100644 --- a/test/wasm_any.js +++ b/test/wasm_any.js @@ -1,13 +1,14 @@ 'use strict'; const expect = require('chai').expect; -const lib = require('../lib/index.js'); +const createVCD = require('../out/vcd.js'); +const webVcdParser = require('../lib/web-vcd-parser.js'); describe('wasm any', function () { it('simple any', function (done) { - lib.createVCD().then(mod => { - lib.webVcdParser(mod).then(inst => { + createVCD().then(mod => { + webVcdParser(mod).then(inst => { const dump = []; inst.change.any((id, time, cmd, value, mask) => { diff --git a/test/wasm_basic.js b/test/wasm_basic.js index 60b8adb..0bae160 100644 --- a/test/wasm_basic.js +++ b/test/wasm_basic.js @@ -1,24 +1,25 @@ 'use strict'; const expect = require('chai').expect; -const lib = require('../lib/index.js'); +const createVCD = require('../out/vcd.js'); +const webVcdParser = require('../lib/web-vcd-parser.js'); describe('wasm basic', () => { it('typeof vcd', async function () { - const mod = await lib.createVCD(); + const mod = await createVCD(); expect(mod).to.be.an('object'); }); it('typeof vcd instance', async function () { - const mod = await lib.createVCD(); - const inst = await lib.webVcdParser(mod); + const mod = await createVCD(); + const inst = await webVcdParser(mod); expect(inst).to.be.an('object'); }); it('fail: foo bar', async function () { - const mod = await lib.createVCD(); - const inst = await lib.webVcdParser(mod); + const mod = await createVCD(); + const inst = await webVcdParser(mod); expect(inst.write(Buffer.from(' foo bar ???'))).to.eq(true); expect(inst.info).to.deep.eq({ stack: [{}], @@ -28,8 +29,8 @@ describe('wasm basic', () => { }); it('$comment', async function () { - const mod = await lib.createVCD(); - const inst = await lib.webVcdParser(mod); + const mod = await createVCD(); + const inst = await webVcdParser(mod); expect(inst.write(Buffer.from( ' \n $comment some text $end $comment more text $end ???' ))).to.eq(true); @@ -42,8 +43,8 @@ describe('wasm basic', () => { }); it('$version', async function () { - const mod = await lib.createVCD(); - const inst = await lib.webVcdParser(mod); + const mod = await createVCD(); + const inst = await webVcdParser(mod); expect(inst.write(` $version Generated by VerilatedVcd $end $date Wed Sep 18 22:59:07 2019 diff --git a/test/wasm_dump.js b/test/wasm_dump.js index 57779b8..d6119c1 100644 --- a/test/wasm_dump.js +++ b/test/wasm_dump.js @@ -1,13 +1,14 @@ 'use strict'; const expect = require('chai').expect; -const lib = require('../lib/index.js'); +const createVCD = require('../out/vcd.js'); +const webVcdParser = require('../lib/web-vcd-parser.js'); describe('wasm dump', function () { it('simple wasm', function (done) { - lib.createVCD().then(function (mod) { - lib.webVcdParser(mod).then(function (inst) { + createVCD().then(function (mod) { + webVcdParser(mod).then(function (inst) { const dump = []; ['"}G', '{u', 'u)'] // array of all signal ids .map(id => diff --git a/test/wasm_events.js b/test/wasm_events.js index eb72d05..8c09593 100644 --- a/test/wasm_events.js +++ b/test/wasm_events.js @@ -1,13 +1,14 @@ 'use strict'; const expect = require('chai').expect; -const lib = require('../lib/index.js'); +const createVCD = require('../out/vcd.js'); +const webVcdParser = require('../lib/web-vcd-parser.js'); describe('wasm events', () => { it('$enddefinitions', async function () { - const mod = await lib.createVCD(); - const inst = await lib.webVcdParser(mod); + const mod = await createVCD(); + const inst = await webVcdParser(mod); inst.on('$enddefinitions', () => { expect(inst.info).to.deep.eq({