Test fixes and review feedback

rust-lang · Apr 8, 2015 · 3df822f · 3df822f
1 parent 2625276
commit 3df822f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
@@ -726,18 +726,18 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
                 -> ProcRes {
         // Prepare the lldb_batchmode which executes the debugger script
         let lldb_script_path = rust_src_root.join("src/etc/lldb_batchmode.py");
-        cmd2proces(config,
-                   test_executable,
-                   Command::new(&config.python)
-                           .arg(&lldb_script_path)
-                           .arg(test_executable)
-                           .arg(debugger_script)
-                           .env("PYTHONPATH",
-                                config.lldb_python_dir.as_ref().unwrap()))
+        cmd2procres(config,
+                    test_executable,
+                    Command::new(&config.python)
+                            .arg(&lldb_script_path)
+                            .arg(test_executable)
+                            .arg(debugger_script)
+                            .env("PYTHONPATH",
+                                 config.lldb_python_dir.as_ref().unwrap()))
     }
 }
 
-fn cmd2proces(config: &Config, test_executable: &Path, cmd: &mut Command)
+fn cmd2procres(config: &Config, test_executable: &Path, cmd: &mut Command)
               -> ProcRes {
     let (status, out, err) = match cmd.output() {
         Ok(Output { status, stdout, stderr }) => {
@@ -1828,12 +1828,12 @@ fn run_rustdoc_test(config: &Config, props: &TestProps, testfile: &Path) {
     }
     let root = find_rust_src_root(config).unwrap();
 
-    let res = cmd2proces(config,
-                         testfile,
-                         Command::new(&config.python)
-                                 .arg(root.join("src/etc/htmldocck.py"))
-                                 .arg(out_dir)
-                                 .arg(testfile));
+    let res = cmd2procres(config,
+                          testfile,
+                          Command::new(&config.python)
+                                  .arg(root.join("src/etc/htmldocck.py"))
+                                  .arg(out_dir)
+                                  .arg(testfile));
     if !res.status.success() {
         fatal_proc_rec("htmldocck failed!", &res);
     }

diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
@@ -124,7 +124,7 @@ fn scrape_test_config(krate: &::syntax::ast::Crate) -> TestOptions {
     use syntax::print::pprust;
 
     let mut opts = TestOptions {
-        no_crate_inject: true,
+        no_crate_inject: false,
         attrs: Vec::new(),
     };
 

diff --git a/src/test/run-make/issue-22131/foo.rs b/src/test/run-make/issue-22131/foo.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![crate_name="foo"]
-
 /// ```rust
 /// assert_eq!(foo::foo(), 1);
 /// ```