From 3598e905aab13d94835aec502699767fa596e8ed Mon Sep 17 00:00:00 2001 From: Bas Bossink Date: Wed, 5 Dec 2018 22:26:53 +0100 Subject: [PATCH] Make failing_alternate_backend test more platform specific Use the suggestion from @Michael-F-Bryan to make the passing_ and failing_alternate_backend test more reliable across platforms. --- tests/alternate_backends.rs | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/alternate_backends.rs b/tests/alternate_backends.rs index c7ebb6b8..41cf2f84 100644 --- a/tests/alternate_backends.rs +++ b/tests/alternate_backends.rs @@ -11,14 +11,14 @@ use tempfile::{Builder as TempFileBuilder, TempDir}; #[test] fn passing_alternate_backend() { - let (md, _temp) = dummy_book_with_backend("passing", "true"); + let (md, _temp) = dummy_book_with_backend("passing", success_cmd()); md.build().unwrap(); } #[test] fn failing_alternate_backend() { - let (md, _temp) = dummy_book_with_backend("failing", "false"); + let (md, _temp) = dummy_book_with_backend("failing", fail_cmd()); md.build().unwrap_err(); } @@ -84,3 +84,19 @@ fn dummy_book_with_backend(name: &str, command: &str) -> (MDBook, TempDir) { (md, temp) } + +fn fail_cmd() -> &'static str { + if cfg!(windows) { + r#"cmd.exe /c "exit 1""# + } else { + "false" + } +} + +fn success_cmd() -> &'static str { + if cfg!(windows) { + r#"cmd.exe /c "exit 0""# + } else { + "true" + } +}