From 6cf5fd51a686ef135ca17f1cdfabe1b62b5c628b Mon Sep 17 00:00:00 2001 From: Paul Masurel Date: Wed, 3 Aug 2016 08:35:34 +0900 Subject: [PATCH] Trying to fix travis code coverage --- .travis.yml | 6 ++++-- Cargo.toml | 7 +++++-- src/cli/bench.rs | 12 +++++++++--- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index b57ac2dba..3accaa174 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,5 +34,7 @@ script: travis-cargo bench && travis-cargo doc after_success: - - travis-cargo doc-upload - - travis-cargo coveralls --no-sudo + - travis-cargo doc-upload + - travis-cargo coveralls --no-sudo + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then travis-cargo coveralls --no-sudo --verify; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./kcov/build/src/kcov --verify --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov target/debug/tantivy-6*; fi diff --git a/Cargo.toml b/Cargo.toml index aa14f4cdb..e5c06d089 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,9 +32,12 @@ rand = "0.3.13" gcc = "0.3.24" [[bin]] -name = "tantivy-merge" +name = "tantivy_merge" path = "src/cli/merge.rs" [[bin]] -name = "tantivy-bench" +name = "tantivy_bench" path = "src/cli/bench.rs" + +[profile.release] +debug = true \ No newline at end of file diff --git a/src/cli/bench.rs b/src/cli/bench.rs index e5b66fe11..1814fb221 100644 --- a/src/cli/bench.rs +++ b/src/cli/bench.rs @@ -40,7 +40,8 @@ fn read_query_file(query_path: &String) -> io::Result> { } fn run(directory: String, - query_filepath: String) -> io::Result<()> { + query_filepath: String, + num_repeat: usize) -> io::Result<()> { println!("Directory : {:?}", directory); println!("Query : {:?}", directory); @@ -55,7 +56,7 @@ fn run(directory: String, let query_parser = QueryParser::new(index.schema(), default_search_fields); println!("{}\t{}\t{}\t{}", "query", "num_terms", "num hits", "time in microsecs"); - for _ in 0..10 { + for _ in 0..num_repeat { for query_txt in &queries { let query = query_parser.parse_query(&query_txt).unwrap(); let num_terms = query.num_terms(); @@ -75,6 +76,7 @@ fn run(directory: String, fn main() { let mut directory = String::from("."); let mut query_file = String::from("query.txt"); + let mut repeat: usize = 1; { let mut ap = ArgumentParser::new(); ap.set_description("Merge a few segments together"); @@ -86,7 +88,11 @@ fn main() { .add_option(&["-q", "--queries"], Store, "Path to the tantivy index directory"); + ap.refer(&mut repeat) + .add_option(&["-n", "--repeat"], + Store, + "Number of iterations"); ap.parse_args_or_exit(); } - run(directory, query_file).unwrap(); + run(directory, query_file, repeat).unwrap(); }