test suite: Output UTF-8 from cmd.exe on Windows

Author: petrochenkov

src/liblibc/lib.rs

@@ -1827,6 +1827,7 @@ pub mod types {
                 pub type HINSTANCE = HANDLE;
                 pub type HMODULE = HINSTANCE;
 
+                pub type UINT = c_uint;
                 pub type LONG = c_long;
                 pub type PLONG = *mut c_long;
 
@@ -6170,7 +6171,7 @@ pub mod funcs {
 
         pub mod kernel32 {
             use types::os::arch::c95::{c_uint};
-            use types::os::arch::extra::{BOOL, DWORD, SIZE_T, HMODULE,
+            use types::os::arch::extra::{BOOL, UINT, DWORD, SIZE_T, HMODULE,
                                                LPCWSTR, LPWSTR,
                                                LPWCH, LPDWORD, LPVOID,
                                                LPCVOID, LPOVERLAPPED,
@@ -6355,6 +6356,8 @@ pub mod funcs {
                                            lpNumberOfBytesTransferred: LPDWORD,
                                            bWait: BOOL) -> BOOL;
                 pub fn DisconnectNamedPipe(hNamedPipe: HANDLE) -> BOOL;
+                pub fn GetConsoleOutputCP() -> UINT;
+                pub fn SetConsoleOutputCP(wCodePageID: UINT) -> BOOL;
             }
         }
 

src/libtest/lib.rs

@@ -638,6 +638,35 @@ pub fn fmt_bench_samples(bs: &BenchSamples) -> String {
     }
 }
 
+struct ConsoleOutputCPGuard {
+    #[allow(dead_code)]
+    old_cp: libc::UINT
+}
+
+impl ConsoleOutputCPGuard {
+    #[cfg(windows)]
+    fn new(new_cp: libc::UINT) -> Self {
+        unsafe {
+            let res = ConsoleOutputCPGuard { old_cp: libc::GetConsoleOutputCP() };
+            libc::SetConsoleOutputCP(new_cp);
+            res
+        }
+    }
+    #[cfg(not(windows))]
+    fn new(_new_cp: libc::UINT) -> Self {
+        ConsoleOutputCPGuard { old_cp: 0 }
+    }
+}
+
+#[cfg(windows)]
+impl Drop for ConsoleOutputCPGuard {
+    fn drop(&mut self) {
+        unsafe {
+            libc::SetConsoleOutputCP(self.old_cp);
+        }
+    }
+}
+
 // A simple console test runner
 pub fn run_tests_console(opts: &TestOpts, tests: Vec<TestDescAndFn> ) -> io::Result<bool> {
 
@@ -695,6 +724,10 @@ pub fn run_tests_console(opts: &TestOpts, tests: Vec<TestDescAndFn> ) -> io::Res
         },
         None => {}
     }
+    // Tests on Windows use cmd.exe commands like `set` or `cd`, their output should
+    // be encoded in UTF-8 (issue #25268). Encoding of cmd.exe's output is controlled
+    // by console output code page, so set it to UTF-8 temporarily.
+    let _guard = ConsoleOutputCPGuard::new(65001);
     try!(run_tests(opts, tests, |x| callback(&x, &mut st)));
     return st.write_run_finish();
 }

src/test/run-pass/issue-25268.rs

@@ -0,0 +1,39 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::process::Command;
+use std::env;
+
+#[cfg(all(unix, not(target_os="android")))]
+pub fn env_cmd() -> Command {
+    Command::new("env")
+}
+#[cfg(target_os="android")]
+pub fn env_cmd() -> Command {
+    let mut cmd = Command::new("/system/bin/sh");
+    cmd.arg("-c").arg("set");
+    cmd
+}
+
+#[cfg(windows)]
+pub fn env_cmd() -> Command {
+    let mut cmd = Command::new("cmd");
+    cmd.arg("/c").arg("set");
+    cmd
+}
+
+
+fn main() {
+    let result = env_cmd().env("RUST_ISSUE_25268", "æ").output().unwrap();
+    let output = String::from_utf8(result.stdout).unwrap();
+
+    assert!(output.contains("RUST_ISSUE_25268=æ"),
+            "didn't find RUST_ISSUE_25268=æ inside of:\n\n{}", output);
+}