Merge branch 'version020'

.travis.yml

@@ -15,6 +15,7 @@ os:
 
 rust:
     - 1.8.0
+    - 1.9.0
     - beta
     - nightly
 
@@ -50,11 +51,10 @@ install:
         fi
 
 script:
-    - cargo test --target "$HOST"
+    - RUSTFLAGS="-C link-dead-code" cargo test --target "$HOST"
 
 after_success:
     # Note: we skip the `check-specimen` test in coverage because kcov cannot do recursive-ptrace.
     # Track this file: https://github.com/SimonKagstrom/kcov/blob/master/tests/recursive-ptrace/main.cc
-    - cargo clean
-    - cargo run -- kcov --bin cargo-kcov --coveralls -- --verify
+    - cargo run -- kcov --target "$HOST" --no-clean-rebuild --lib --coveralls -- --verify
 

Cargo.toml

@@ -1,18 +1,20 @@
 [package]
 name = "cargo-kcov"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["kennytm <[email protected]>"]
 description = "Cargo subcommand to run kcov to get coverage report on Linux"
 repository = "https://github.com/kennytm/cargo-kcov"
 keywords = ["cargo", "subcommand", "kcov", "coverage"]
 license = "MIT"
 
 [dependencies]
-clap = "2.5.1"
+clap = "2.5.2"
 shlex = "0.1.1"
 term = "0.4.4"
 rustc-serialize = "0.3.19" # use serde instead? we just use it to parse a simple JSON...
+regex = "0.1.71"
 
 [dev-dependencies]
 rquery = "0.2.1"
+tempdir = "0.3.4"
 

specimen/benches/cargo-kcov-test.rs

@@ -0,0 +1 @@
+fn main() {}

specimen/src/lib.rs

@@ -49,6 +49,10 @@ pub fn test_this_in_eighth() -> bool {
     true
 }
 
+pub fn test_this_in_korean() -> bool {
+    true
+}
+
 pub fn should_never_test_this() -> bool {
     true
 }

specimen/tests/cargo-kcov-test.rs

@@ -0,0 +1 @@
+fn main() {}

specimen/tests/한국어이름.rs

@@ -0,0 +1,10 @@
+extern crate cargo_kcov_test;
+
+fn main() {
+    assert!(cargo_kcov_test::test_this_in_korean());
+}
+
+#[test]
+fn test_korean() {
+    main();
+}

src/errors.rs

@@ -26,6 +26,7 @@ pub enum Error {
     },
     KcovFailed(Option<io::Error>),
     NoCoverallsId,
+    CannotFindTestTargets(Option<io::Error>),
 }
 
 impl Error {
@@ -41,6 +42,7 @@ impl Error {
             Error::CannotCreateCoverageDirectory(_) => "cannot create coverage output directory",
             Error::KcovFailed(_) => "failed to get coverage",
             Error::NoCoverallsId => "missing environment variable TRAVIS_JOB_ID for coveralls",
+            Error::CannotFindTestTargets(_) => "cannot find test targets",
         }
     }
 
@@ -52,6 +54,7 @@ impl Error {
             Error::Json(ref e) => e.as_ref().map(|a| a as &Display),
             Error::CannotCreateCoverageDirectory(ref e) => Some(e),
             Error::KcovFailed(ref e) => e.as_ref().map(|a| a as &Display),
+            Error::CannotFindTestTargets(ref e) => e.as_ref().map(|a| a as &Display),
             _ => None,
         }
     }
@@ -118,16 +121,22 @@ impl Error {
                 t.fg(WHITE).unwrap();
                 t.write_all(b"    $ ").unwrap();
                 t.reset().unwrap();
-                writeln!(t, "wget https://github.com/SimonKagstrom/kcov/archive/v{0}.tar.gz &&
-        tar xzf v{0}.tar.gz &&
-        cd kcov-{0} &&
-        mkdir build &&
-        cd build &&
-        cmake -DCMAKE_BUILD_TYPE=Release .. &&
-        make &&
-        cp src/kcov src/libkcov_sowrapper.so ~/.cargo/bin
-
-                ", 31).unwrap();
+                writeln!(t, "cargo kcov --print-install-kcov-sh | sh").unwrap();
+            }
+            Error::CannotFindTestTargets(_) => {
+                t.fg(GREEN).unwrap();
+                t.attr(Attr::Bold).unwrap();
+                t.write_all(b"note: ").unwrap();
+                t.reset().unwrap();
+                t.write_all(b"try a clean rebuild first:\n\n").unwrap();
+                t.fg(WHITE).unwrap();
+                t.write_all(b"    $ ").unwrap();
+                t.reset().unwrap();
+                writeln!(t, "cargo clean &&
+        RUSTFLAGS=\"-C link-dead-code\" cargo test --no-run &&
+        cargo kcov --no-clean-rebuild
+
+                ").unwrap();
             }
             _ => {}
         }

src/install_kcov.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -euo pipefail
+
+KCOV_VERSION=31
+
+wget https://github.com/SimonKagstrom/kcov/archive/v${KCOV_VERSION}.tar.gz
+tar xzf v${KCOV_VERSION}.tar.gz
+cd kcov-${KCOV_VERSION}
+mkdir build
+cd build
+cmake -DCMAKE_BUILD_TYPE=Release ..
+make
+cp src/kcov src/libkcov_sowrapper.so ~/.cargo/bin
+