aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Godbolt <matt@godbolt.org>2017-12-21 12:02:20 -0600
committerMatt Godbolt <matt@godbolt.org>2017-12-21 12:02:20 -0600
commit7e589d7cd7cfe207ced237b51e59caefc9feb0c3 (patch)
treeabfb0813e0265468350cf2cab6182c59f9150c64
parent5a2066b6b56e8e9cd570a39ce7f0e3f2c0136369 (diff)
parenta47b5127b5577619ecfd5a1305015ceb33ff121c (diff)
downloadcompiler-explorer-7e589d7cd7cfe207ced237b51e59caefc9feb0c3.tar.gz
compiler-explorer-7e589d7cd7cfe207ced237b51e59caefc9feb0c3.zip
Merge branch 'master' into unification
-rw-r--r--.istanbul.yml2
-rw-r--r--package.json6
2 files changed, 5 insertions, 3 deletions
diff --git a/.istanbul.yml b/.istanbul.yml
index 620661511..55d944d8e 100644
--- a/.istanbul.yml
+++ b/.istanbul.yml
@@ -1,5 +1,7 @@
instrumentation:
root: ./lib
include-all-sources: true
+ excludes:
+ - "handlers/asm-docs.js"
reporting:
dir: ./out/coverage
diff --git a/package.json b/package.json
index 2cde31493..2f76271a7 100644
--- a/package.json
+++ b/package.json
@@ -56,9 +56,9 @@
},
"scripts": {
"test": "mocha --recursive && make test",
- "codecov": "istanbul cover ./node_modules/mocha/bin/_mocha --recursive --report lcovonly -- -R spec && codecov",
- "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha --recursive --report lcovonly -- -R spec",
- "localcoverage": "istanbul cover ./node_modules/mocha/bin/_mocha --recursive --report html -- -R spec"
+ "codecov": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec --recursive && codecov",
+ "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec --recursive",
+ "localcoverage": "istanbul cover ./node_modules/mocha/bin/_mocha --report html -- -R spec --recursive"
},
"license": "BSD-2-Clause"
}