Skip to content

Commit 0b902af

Browse files
authored
Merge pull request #88 from ukrustacean/make-final
READY: `make` finalize
2 parents 007552b + 20de5f6 commit 0b902af

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

make/tests/integration.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,6 @@ mod macros {
340340
}
341341

342342
mod target_behavior {
343-
use super::*;
344343
use super::*;
345344
use libc::{kill, SIGINT};
346345
use posixutils_make::parser::parse::ParseError;
@@ -547,7 +546,7 @@ mod recipes {
547546

548547
mod special_targets {
549548
use std::{fs, thread, time::Duration};
550-
549+
use std::fs::remove_dir;
551550
use super::*;
552551
use libc::{kill, SIGINT};
553552
use posixutils_make::special_target;
@@ -625,15 +624,19 @@ mod special_targets {
625624
let output = child.wait_with_output().expect("failed to wait for child");
626625

627626
let stdout = String::from_utf8_lossy(&output.stdout);
628-
assert_eq!(stdout, "echo hello\nhello\ntouch some.txt\nsleep 1\n");
629-
assert!(fs::exists("./some.txt").unwrap());
627+
assert_eq!(
628+
stdout,
629+
"echo hello\nhello\nmkdir preciousdir\ntouch preciousdir/some.txt\nsleep 1\n"
630+
);
631+
assert!(fs::exists("preciousdir/some.txt").unwrap());
630632

631633
let stderr = String::from_utf8_lossy(&output.stderr);
632634
assert_eq!(stderr, "make: Interrupt\n");
633635

634636
assert_eq!(output.status.code(), Some(130));
635637

636-
remove_file("some.txt").unwrap();
638+
remove_file("preciousdir/some.txt").unwrap();
639+
remove_dir("preciousdir").unwrap();
637640
}
638641

639642
#[test]
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.PRECIOUS:
22
text.txt:
33
echo hello
4-
touch some.txt
4+
mkdir preciousdir
5+
touch preciousdir/some.txt
56
sleep 1
67
echo bye

0 commit comments

Comments
 (0)