use kcov tool from holonix

neonphog · neonphog · commit 0072eadb5f6f · 2020-03-11T15:11:18.000-06:00
diff --git a/config.nix b/config.nix
@@ -5,8 +5,8 @@ let
  # tag will ultimately be current version when it hits holonix
  # https://github.com/holochain/holonix/blob/master/release/default.nix#L7
  tag = "v${current}";
- holonix-version = "v0.0.67";
- holonix-sha256 = "1rbajpads9w5gnrq89x8xw65ain6z4vxx57wj47m87768zzjadi7";
+ holonix-version = "v0.0.68";
+ holonix-sha256 = "1lwvl49j3f5ydakaxzqy54i6qw9cnwxmn4b0c5dhzfq0v2mx42jw";
 in
 rec {
 
diff --git a/rust/test/default.nix b/rust/test/default.nix
@@ -11,9 +11,6 @@ let
   # cargo-make coverage only really works for individual crates so we futz
   # with the CARGO_TARGET_DIR - also we just blanket install cargo-make
 
-  # using cargo-make for executing kcov
-  cargo install cargo-make
-
   # some tests require compiled wasm
   hc-rust-wasm-compile
 
@@ -56,5 +53,5 @@ let
   '';
 in
 {
- buildInputs = if pkgs.stdenv.isLinux then [ pkgs.kcov pkgs.curl hc-rust-test hc-rust-coverage-kcov ] else [ hc-rust-test ];
+ buildInputs = if pkgs.stdenv.isLinux then [ hc-rust-test hc-rust-coverage-kcov ] else [ hc-rust-test ];
 }

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,6 @@ let`
`11`	`11`	`# cargo-make coverage only really works for individual crates so we futz`
`12`	`12`	`# with the CARGO_TARGET_DIR - also we just blanket install cargo-make`
`13`	`13`
`14`		`- # using cargo-make for executing kcov`
`15`		`- cargo install cargo-make`
`16`		`-`
`17`	`14`	`# some tests require compiled wasm`
`18`	`15`	`hc-rust-wasm-compile`
`19`	`16`
`@@ -56,5 +53,5 @@ let`
`56`	`53`	`'';`
`57`	`54`	`in`
`58`	`55`	`{`
`59`		`- buildInputs = if pkgs.stdenv.isLinux then [ pkgs.kcov pkgs.curl hc-rust-test hc-rust-coverage-kcov ] else [ hc-rust-test ];`
	`56`	`+ buildInputs = if pkgs.stdenv.isLinux then [ hc-rust-test hc-rust-coverage-kcov ] else [ hc-rust-test ];`
`60`	`57`	`}`