Add process id to temp file name

This commit is contained in:
Chris Pearce 2019-04-07 17:28:51 +01:00
parent 4fa79ee02f
commit 592ae6b4d2
1 changed files with 11 additions and 7 deletions

View File

@ -1,11 +1,15 @@
use std::fs::remove_file;
use std::process::{Command, Output};
use std::process::{self, Command, Output};
const RUSTC_COLOR_ARGS: &[&str] = &["--color", "always"];
fn temp_file() -> String {
format!("./temp_{}", process::id())
}
pub fn compile_test_cmd(filename: &str) -> Output {
Command::new("rustc")
.args(&["--test", filename, "-o", "temp"])
.args(&["--test", filename, "-o", &temp_file()])
.args(RUSTC_COLOR_ARGS)
.output()
.expect("failed to compile exercise")
@ -13,25 +17,25 @@ pub fn compile_test_cmd(filename: &str) -> Output {
pub fn compile_cmd(filename: &str) -> Output {
Command::new("rustc")
.args(&[filename, "-o", "temp"])
.args(&[filename, "-o", &temp_file()])
.args(RUSTC_COLOR_ARGS)
.output()
.expect("failed to compile exercise")
}
pub fn run_cmd() -> Output {
Command::new("./temp")
Command::new(&temp_file())
.output()
.expect("failed to run exercise")
}
pub fn clean() {
let _ignored = remove_file("temp");
let _ignored = remove_file(&temp_file());
}
#[test]
fn test_clean() {
std::fs::File::create("temp").unwrap();
std::fs::File::create(&temp_file()).unwrap();
clean();
assert!(!std::path::Path::new("temp").exists());
assert!(!std::path::Path::new(&temp_file()).exists());
}