Skip to content

Commit 991a3dc

Browse files
committed
Travis fixes
1 parent 744af14 commit 991a3dc

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ test: build_native
2525
@echo "\n == Run All tests minus replicaset tests=="
2626
$(NODE) dev/tools/test_all.js --noreplicaset --boot
2727

28+
test_pure: build_native
29+
@echo "\n == Run All tests minus replicaset tests=="
30+
$(NODE) dev/tools/test_all.js --noreplicaset --boot --noactive
31+
2832
test_junit: build_native
2933
@echo "\n == Run All tests minus replicaset tests=="
3034
$(NODE) dev/tools/test_all.js --junit --noreplicaset

dev/tools/test_all.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ var specifedParameter = function(arguments, param) {
4545
var junit = specifedParameter(process.argv, '--junit', false);
4646
var noReplicaSet = specifedParameter(process.argv, '--noreplicaset', false);
4747
var boot = specifedParameter(process.argv, '--boot', false);
48+
var nonative = specifedParameter(process.argv, '--nonative', false);
4849
// Basic default test runner
4950
var runner = nodeunit.reporters.default;
5051
var options = { error_prefix: '\u001b[31m',
@@ -145,6 +146,10 @@ exec('rm -rf ./output', function(err, stdout, stderr) {
145146
},
146147

147148
function runNativeJS() {
149+
if(nonative) {
150+
return this(null, null);
151+
}
152+
148153
options.suffix = 'native';
149154
options.native = true;
150155

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"bson": "0.0.4"
6666
}
6767
, "devDependencies": {
68-
"dox": "0.1.3"
68+
"dox": "0.2.0"
6969
, "uglify-js": "1.2.5"
7070
, "ejs": "0.6.1"
7171
, "nodeunit": "0.7.3"
@@ -78,7 +78,7 @@
7878
, "main": "./lib/mongodb/index"
7979
, "directories" : { "lib" : "./lib/mongodb" }
8080
, "engines" : { "node" : ">=0.4.0" }
81-
, "scripts": { "test" : "make test" }
81+
, "scripts": { "test" : "make test_pure" }
8282
, "licenses" : [ { "type" : "Apache License, Version 2.0"
8383
, "url" : "http://www.apache.org/licenses/LICENSE-2.0" } ]
8484
}

0 commit comments

Comments
 (0)