diff --git a/tests/fixtures/coverage-reports/merge/merge.full.json b/tests/fixtures/coverage-reports/merge/merge.full.json index 0b53f38c..7ba0efcf 100644 --- a/tests/fixtures/coverage-reports/merge/merge.full.json +++ b/tests/fixtures/coverage-reports/merge/merge.full.json @@ -191,7 +191,7 @@ 9, 3, 13, - 1, + 0, 0, 0, 0 @@ -201,7 +201,7 @@ 9, 5, 14, - 0, + 1, 0, 0, 0 @@ -229,7 +229,7 @@ [ 10, 1, - 14, + 12, 23, 1, 0, @@ -311,7 +311,7 @@ 9, 3, 13, - 0, + 1, 0, 0, 0 @@ -321,7 +321,7 @@ 9, 5, 14, - 1, + 0, 0, 0, 0 @@ -349,7 +349,7 @@ [ 10, 1, - 12, + 14, 23, 1, 0, diff --git a/tests/fixtures/coverage-reports/merge/merge.txt b/tests/fixtures/coverage-reports/merge/merge.txt index cd4543bf..aa9f9092 100644 --- a/tests/fixtures/coverage-reports/merge/merge.txt +++ b/tests/fixtures/coverage-reports/merge/merge.txt @@ -16,18 +16,18 @@ | merge::func: | 1| 1|fn func(x: i32) -> bool { | 2| 1| if x < 0 { - | 3| 1| true + | 3| 0| true | 4| | } else { - | 5| 0| false + | 5| 1| false | 6| | } | 7| 1|} ------------------ | merge::func: | 1| 1|fn func(x: i32) -> bool { | 2| 1| if x < 0 { - | 3| 0| true + | 3| 1| true | 4| | } else { - | 5| 1| false + | 5| 0| false | 6| | } | 7| 1|} ------------------ @@ -51,15 +51,15 @@ | 10| 1|fn test() { | 11| 1| #[cfg(feature = "a")] | 12| 1| assert!(!func(1)); - | 13| 1| #[cfg(feature = "b")] - | 14| 1| assert!(func(-1)); + | 13| | #[cfg(feature = "b")] + | 14| | assert!(func(-1)); | 15| 1|} ------------------ | merge::test: | 10| 1|fn test() { | 11| 1| #[cfg(feature = "a")] | 12| 1| assert!(!func(1)); - | 13| | #[cfg(feature = "b")] - | 14| | assert!(func(-1)); + | 13| 1| #[cfg(feature = "b")] + | 14| 1| assert!(func(-1)); | 15| 1|} ------------------ \ No newline at end of file diff --git a/tests/test.rs b/tests/test.rs index bf6ecd62..ffbc97a1 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -79,12 +79,6 @@ fn merge() { let output_dir = auxiliary::FIXTURES_PATH.join("coverage-reports").join(model); fs::create_dir_all(&output_dir).unwrap(); for (extension, args) in test_set() { - // TODO: On windows, the order of the instantiations in the generated coverage report will be different. - #[cfg(windows)] - if extension == "txt" || extension == "full.json" { - continue; - } - let workspace_root = auxiliary::test_project(model, model).unwrap(); let output_path = &output_dir.join(model).with_extension(extension); cargo_llvm_cov()