Simplifying echo test and using #[cfg(plat)] now

Windows and *nix specific exec tests now. Line endings for output of
windows exec might still be a problem on AppVeyor/Travis.
This commit is contained in:
SpatulaNinja 2017-10-19 22:50:48 -05:00
parent d3831eecf3
commit 3a7fe6e140

View file

@ -536,22 +536,19 @@ fn test_symlink() {
fn test_exec() { fn test_exec() {
let te = TestEnv::new(); let te = TestEnv::new();
// Test a simple echo before each result // Test a simple echo before result
te.assert_output( te.assert_output(&["--exec", "echo found", "d.foo"], "found one/two/three/d.foo");
&["--exec", "echo found", "foo"],
"found a.foo
found one/b.foo
found one/two/c.foo
found one/two/C.Foo2
found one/two/three/d.foo
found one/two/three/directory_foo",
);
#[cfg(windows)]
// Test executing 'fc' (File Compare) with the found result and itself. // Test executing 'fc' (File Compare) with the found result and itself.
te.assert_output( te.assert_output(
&["--exec", "fc {} {}", "a.foo"], &["--exec", "fc {} {}", "a.foo"],
" "
Comparing files a.foo and A.FOO Comparing files a.foo and A.FOO
FC: no differences encountered" FC: no differences encountered",
); );
#[cfg(unix)]
// Test executing 'diff' with the found result and itself.
te.assert_output(&["--exec", "diff {} {}", "a.foo"],"");
} }