ci: fix ci on mac (tikv#411)

* Fix ci fail on mac

.travis.yml

@@ -37,4 +37,4 @@ install:
 script:
   - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$rocksdb_dir"
   - export LIBRARY_PATH="$LD_LIBRARY_PATH"
-  - cargo test
+  - ENABLE_FEATURES=default make test

Cargo.toml

@@ -51,9 +51,6 @@ git = "https://github.com/pingcap/kvproto"
 [dependencies.tipb]
 git = "https://github.com/pingcap/tipb.git"
 
-[dev-dependencies]
-env_logger = "0.3"
-
 [profile.dev]
 opt-level = 0  # Controls the --opt-level the compiler builds with
 debug = true   # Controls whether the compiler passes `-g`

Makefile

@@ -1,24 +1,26 @@
+ENABLE_FEATURES ?= dev
+
 .PHONY: all
 
 all: format build test
 
 build:
-	cargo build --features "dev"
+	cargo build --features ${ENABLE_FEATURES}
 
 run:
-	cargo run --features "dev"
+	cargo run --features ${ENABLE_FEATURES}
 
 release:
 	cargo build --release --bin tikv-server
 
 test:
 	# todo remove ulimit once issue #372 of mio is resolved.
-	ulimit -n 2000 && LOG_LEVEL=DEBUG RUST_BACKTRACE=1 cargo test --features "dev" -- --nocapture 
+	ulimit -n 2000 && LOG_LEVEL=DEBUG RUST_BACKTRACE=1 cargo test --features ${ENABLE_FEATURES} -- --nocapture 
 
 bench:
 	# todo remove ulimit once issue #372 of mio is resolved.
-	ulimit -n 4096 && LOG_LEVEL=ERROR RUST_BACKTRACE=1 cargo bench --features "dev" -- --nocapture 
-	ulimit -n 4096 && RUST_BACKTRACE=1 cargo run --release --bin bench-tikv --features "dev"
+	ulimit -n 4096 && LOG_LEVEL=ERROR RUST_BACKTRACE=1 cargo bench --features ${ENABLE_FEATURES} -- --nocapture 
+	ulimit -n 4096 && RUST_BACKTRACE=1 cargo run --release --bin bench-tikv --features ${ENABLE_FEATURES}
 
 genprotobuf:
 	cd ./src/proto && protoc --rust_out . *.proto

src/bin/tikv-server.rs

@@ -70,9 +70,9 @@ fn build_raftkv(matches: &Matches,
     let path = get_store_path(matches);
     let mut opts = rocksdb::Options::new();
     let mut block_base_opts = rocksdb::BlockBasedOptions::new();
-    block_base_opts.set_block_size(64*1024);
+    block_base_opts.set_block_size(64 * 1024);
     opts.set_block_based_table_factory(&block_base_opts);
-    opts.set_target_file_size_base(64*1024*1024);
+    opts.set_target_file_size_base(64 * 1024 * 1024);
     opts.create_if_missing(true);
 
     let engine = Arc::new(DB::open(&opts, &path).unwrap());

src/lib.rs

@@ -43,9 +43,6 @@ extern crate kvproto;
 extern crate time;
 extern crate tipb;
 
-#[cfg(test)]
-extern crate env_logger;
-
 #[macro_use]
 pub mod util;
 pub mod raft;

tests/tests.rs

@@ -20,7 +20,6 @@
 #[macro_use]
 extern crate log;
 extern crate protobuf;
-extern crate env_logger;
 #[macro_use]
 extern crate tikv;
 extern crate rand;