nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-30 10:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2685 from alexcrichton/fix-tests

Browse Source 
Fix rustfmt tests in the Rust repo
This commit is contained in:
Nick Cameron 2018-05-09 08:54:11 +12:00 committed by GitHub
commit f8aed3d71a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/test/mod.rs
View File

@ -11,6 +11,7 @@
extern crate assert_cli;
use std::collections::{HashMap, HashSet};
use std::env;
use std::fs;
use std::io::{self, BufRead, BufReader, Read};
use std::iter::{Enumerate, Peekable};
@ -892,14 +893,19 @@ impl Drop for TempFile {
}
}
fn rustfmt() -> PathBuf {
let mut me = env::current_exe().expect("failed to get current executable");
me.pop(); // chop of the test name
me.pop(); // chop off `deps`
me.push("rustfmt");
return me;
}
#[test]
fn verify_check_works() {
let temp_file = make_temp_file("temp_check.rs");
assert_cli::Assert::command(&[
"cargo",
"run",
"--bin=rustfmt",
"--",
rustfmt().to_str().unwrap(),
"--write-mode=check",
temp_file.path.to_str().unwrap(),
]).succeeds()
@ -910,10 +916,7 @@ fn verify_check_works() {
fn verify_diff_works() {
let temp_file = make_temp_file("temp_diff.rs");
assert_cli::Assert::command(&[
"cargo",
"run",
"--bin=rustfmt",
"--",
rustfmt().to_str().unwrap(),
"--write-mode=diff",
temp_file.path.to_str().unwrap(),
]).succeeds()