aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-01-01 22:25:37 +0000
committerGitHub <[email protected]>2020-01-01 22:25:37 +0000
commitcf67c7421340b0f3df5ab8e92f94025da1a7d199 (patch)
treea4b2d609900a876c08c7ac1d0f8872188d868fd3
parentd0a59164d5737f5d53b5d8414ca8d19a715be766 (diff)
parent167cbb7c4dfd569bc7dfaed1466774a8b4b557bf (diff)
Merge #2722
2722: Fix ra_cargo_watch test on windows. r=matklad a=kiljacken Due to difference in path parsing on platforms, the current input to the snapshot tests in ra_cargo_watch cause a panic when running on Windows. This PR disables the tests when running on Windows until a better solution is found. If somebody running on Windows could test this that would be great, as I'm working in the blind here :) Fixes #2720 (probably). Co-authored-by: Emil Lauridsen <[email protected]>
-rw-r--r--crates/ra_cargo_watch/src/conv/test.rs7
1 files changed, 7 insertions, 0 deletions
diff --git a/crates/ra_cargo_watch/src/conv/test.rs b/crates/ra_cargo_watch/src/conv/test.rs
index 381992388..f77ef1b4d 100644
--- a/crates/ra_cargo_watch/src/conv/test.rs
+++ b/crates/ra_cargo_watch/src/conv/test.rs
@@ -7,6 +7,7 @@ fn parse_diagnostic(val: &str) -> cargo_metadata::diagnostic::Diagnostic {
7} 7}
8 8
9#[test] 9#[test]
10#[cfg(not(windows))]
10fn snap_rustc_incompatible_type_for_trait() { 11fn snap_rustc_incompatible_type_for_trait() {
11 let diag = parse_diagnostic( 12 let diag = parse_diagnostic(
12 r##"{ 13 r##"{
@@ -60,6 +61,7 @@ fn snap_rustc_incompatible_type_for_trait() {
60} 61}
61 62
62#[test] 63#[test]
64#[cfg(not(windows))]
63fn snap_rustc_unused_variable() { 65fn snap_rustc_unused_variable() {
64 let diag = parse_diagnostic( 66 let diag = parse_diagnostic(
65 r##"{ 67 r##"{
@@ -142,6 +144,7 @@ fn snap_rustc_unused_variable() {
142} 144}
143 145
144#[test] 146#[test]
147#[cfg(not(windows))]
145fn snap_rustc_wrong_number_of_parameters() { 148fn snap_rustc_wrong_number_of_parameters() {
146 let diag = parse_diagnostic( 149 let diag = parse_diagnostic(
147 r##"{ 150 r##"{
@@ -266,6 +269,7 @@ fn snap_rustc_wrong_number_of_parameters() {
266} 269}
267 270
268#[test] 271#[test]
272#[cfg(not(windows))]
269fn snap_clippy_pass_by_ref() { 273fn snap_clippy_pass_by_ref() {
270 let diag = parse_diagnostic( 274 let diag = parse_diagnostic(
271 r##"{ 275 r##"{
@@ -386,6 +390,7 @@ fn snap_clippy_pass_by_ref() {
386} 390}
387 391
388#[test] 392#[test]
393#[cfg(not(windows))]
389fn snap_rustc_mismatched_type() { 394fn snap_rustc_mismatched_type() {
390 let diag = parse_diagnostic( 395 let diag = parse_diagnostic(
391 r##"{ 396 r##"{
@@ -429,6 +434,7 @@ fn snap_rustc_mismatched_type() {
429} 434}
430 435
431#[test] 436#[test]
437#[cfg(not(windows))]
432fn snap_handles_macro_location() { 438fn snap_handles_macro_location() {
433 let diag = parse_diagnostic( 439 let diag = parse_diagnostic(
434 r##"{ 440 r##"{
@@ -700,6 +706,7 @@ fn snap_handles_macro_location() {
700} 706}
701 707
702#[test] 708#[test]
709#[cfg(not(windows))]
703fn snap_macro_compiler_error() { 710fn snap_macro_compiler_error() {
704 let diag = parse_diagnostic( 711 let diag = parse_diagnostic(
705 r##"{ 712 r##"{