Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Travis fixes

  • Loading branch information...
commit 991a3dc858168fb2b197efdd5078a8c4695c6212 1 parent 744af14
@christkv authored
Showing with 11 additions and 2 deletions.
  1. +4 −0 Makefile
  2. +5 −0 dev/tools/test_all.js
  3. +2 −2 package.json
View
4 Makefile
@@ -25,6 +25,10 @@ test: build_native
@echo "\n == Run All tests minus replicaset tests=="
$(NODE) dev/tools/test_all.js --noreplicaset --boot
+test_pure: build_native
+ @echo "\n == Run All tests minus replicaset tests=="
+ $(NODE) dev/tools/test_all.js --noreplicaset --boot --noactive
+
test_junit: build_native
@echo "\n == Run All tests minus replicaset tests=="
$(NODE) dev/tools/test_all.js --junit --noreplicaset
View
5 dev/tools/test_all.js
@@ -45,6 +45,7 @@ var specifedParameter = function(arguments, param) {
var junit = specifedParameter(process.argv, '--junit', false);
var noReplicaSet = specifedParameter(process.argv, '--noreplicaset', false);
var boot = specifedParameter(process.argv, '--boot', false);
+var nonative = specifedParameter(process.argv, '--nonative', false);
// Basic default test runner
var runner = nodeunit.reporters.default;
var options = { error_prefix: '\u001b[31m',
@@ -145,6 +146,10 @@ exec('rm -rf ./output', function(err, stdout, stderr) {
},
function runNativeJS() {
+ if(nonative) {
+ return this(null, null);
+ }
+
options.suffix = 'native';
options.native = true;
View
4 package.json
@@ -65,7 +65,7 @@
"bson": "0.0.4"
}
, "devDependencies": {
- "dox": "0.1.3"
+ "dox": "0.2.0"
, "uglify-js": "1.2.5"
, "ejs": "0.6.1"
, "nodeunit": "0.7.3"
@@ -78,7 +78,7 @@
, "main": "./lib/mongodb/index"
, "directories" : { "lib" : "./lib/mongodb" }
, "engines" : { "node" : ">=0.4.0" }
-, "scripts": { "test" : "make test" }
+, "scripts": { "test" : "make test_pure" }
, "licenses" : [ { "type" : "Apache License, Version 2.0"
, "url" : "http://www.apache.org/licenses/LICENSE-2.0" } ]
}
Please sign in to comment.
Something went wrong with that request. Please try again.