Skip to content

Commit

Permalink
Get rid of test sub-directory.
Browse files Browse the repository at this point in the history
  • Loading branch information
flatheadmill committed Aug 10, 2016
1 parent 5b4b875 commit af8594b
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
"main": "riffle",
"scripts":
{
"test": "proof platform win32 && proof test */*/*.t.js || t/test"
"test": "proof platform win32 && proof test */*.t.js || t/test"
}
}
4 changes: 2 additions & 2 deletions t/cover
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ set -e
rm -rf coverage

count=1;
for file in $(find t -name \*.t.js); do
node_modules/.bin/istanbul cover -x 't/**' $file > /dev/null 2>&1
for file in $(find . ! -path '*/node_modules/*' -name \*.t.js); do
node_modules/.bin/istanbul cover -x 't/**' -x '*/t/**' $file > /dev/null 2>&1
mv coverage/coverage.json coverage/coverage$count.json
count=$(expr $count + 1)
done
Expand Down
2 changes: 1 addition & 1 deletion t/riffle/empty.t.js → t/empty.t.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ require('./proof')(4, prove)

function prove (async, assert) {
var strata = createStrata({ directory: tmp, leafSize: 3, branchSize: 3 })
var riffle = require('../..')
var riffle = require('..')
async(function () {
strata.create(async())
}, function () {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion t/riffle/forward.t.js → t/forward.t.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ require('./proof')(4, prove)

function prove (async, assert) {
var strata = createStrata({ directory: tmp, leafSize: 3, branchSize: 3 }),
riffle = require('../..')
riffle = require('..')
async(function () {
serialize(__dirname + '/fixtures/nine.json', tmp, async())
}, function () {
Expand Down
2 changes: 1 addition & 1 deletion t/riffle/one.t.js → t/one.t.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ require('./proof')(10, prove)

function prove (async, assert) {
var strata = createStrata({ directory: tmp, leafSize: 3, branchSize: 3 })
var riffle = require('../..')
var riffle = require('..')
async(function () {
strata.create(async())
}, function () {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion t/riffle/reverse.t.js → t/reverse.t.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require('./proof')(7, prove)
function prove (async, assert) {
var cadence = require('cadence'),
strata = createStrata({ directory: tmp, leafSize: 3, branchSize: 3 }),
riffle = require('../..')
riffle = require('..')
async(function () {
serialize(__dirname + '/fixtures/nine.json', tmp, async())
}, function () {
Expand Down
4 changes: 3 additions & 1 deletion t/test
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ set -e

echo ""

(proof run t/*/*.t.js | tee .proof.out | proof progress) || (proof errors < .proof.out) || exit 1
(proof run t/*.t.js | tee .proof.out | proof progress) \
|| (proof errors < .proof.out) \
|| exit 1

if [ "$TRAVIS" = "true" ]; then
echo ""
Expand Down

0 comments on commit af8594b

Please sign in to comment.