Merge pull request rust-lang#3084 from otavio/issue-1990

Enable `stdin_disable_all_formatting_test` test

src/test/mod.rs

@@ -17,6 +17,7 @@ use std::io::{self, BufRead, BufReader, Read, Write};
 use std::iter::{Enumerate, Peekable};
 use std::mem;
 use std::path::{Path, PathBuf};
+use std::process::{Command, Stdio};
 use std::str::Chars;
 
 use config::{Color, Config, EmitMode, FileName, ReportTactic};
@@ -287,28 +288,32 @@ fn stdin_formatting_smoke_test() {
     assert_eq!(buf, "fn main() {}\r\n".as_bytes());
 }
 
-// FIXME(#1990) restore this test
-// #[test]
-// fn stdin_disable_all_formatting_test() {
-//     let input = String::from("fn main() { println!(\"This should not be formatted.\"); }");
-//     let mut child = Command::new("./target/debug/rustfmt")
-//         .stdin(Stdio::piped())
-//         .stdout(Stdio::piped())
-//         .arg("--config-path=./tests/config/disable_all_formatting.toml")
-//         .spawn()
-//         .expect("failed to execute child");
-
-//     {
-//         let stdin = child.stdin.as_mut().expect("failed to get stdin");
-//         stdin
-//             .write_all(input.as_bytes())
-//             .expect("failed to write stdin");
-//     }
-//     let output = child.wait_with_output().expect("failed to wait on child");
-//     assert!(output.status.success());
-//     assert!(output.stderr.is_empty());
-//     assert_eq!(input, String::from_utf8(output.stdout).unwrap());
-// }
+#[test]
+fn stdin_disable_all_formatting_test() {
+    match option_env!("CFG_RELEASE_CHANNEL") {
+        None | Some("nightly") => {}
+        _ => return, // these tests require nightly
+    }
+    let input = String::from("fn main() { println!(\"This should not be formatted.\"); }");
+    let mut child = Command::new("./target/debug/rustfmt")
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .arg("--config-path=./tests/config/disable_all_formatting.toml")
+        .spawn()
+        .expect("failed to execute child");
+
+    {
+        let stdin = child.stdin.as_mut().expect("failed to get stdin");
+        stdin
+            .write_all(input.as_bytes())
+            .expect("failed to write stdin");
+    }
+
+    let output = child.wait_with_output().expect("failed to wait on child");
+    assert!(output.status.success());
+    assert!(output.stderr.is_empty());
+    assert_eq!(input, String::from_utf8(output.stdout).unwrap());
+}
 
 #[test]
 fn format_lines_errors_are_reported() {