bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #56514 - ollie27:rustdoc_test_libdir, r=QuietMisdreavus

Browse source 
rustdoc: Don't modify library path for doctests

It shouldn't be needed anymore because doctests are no longer compiled with `prefer-dynamic` (since #54939).

r? @QuietMisdreavus
This commit is contained in:
bors 2019-02-19 07:27:39 +00:00
commit fcccf06fc9
2 changed files with 5 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/librustdoc/test.rs
View file

@ -5,12 +5,11 @@ use rustc_lint;
use rustc_driver::{self, driver, target_features, Compilation}; use rustc_driver::{self, driver, target_features, Compilation};
use rustc_driver::driver::phase_2_configure_and_expand; use rustc_driver::driver::phase_2_configure_and_expand;
use rustc_metadata::cstore::CStore; use rustc_metadata::cstore::CStore;
use rustc_metadata::dynamic_lib::DynamicLibrary;
use rustc::hir; use rustc::hir;
use rustc::hir::intravisit; use rustc::hir::intravisit;
use rustc::session::{self, CompileIncomplete, config}; use rustc::session::{self, CompileIncomplete, config};
use rustc::session::config::{OutputType, OutputTypes, Externs, CodegenOptions}; use rustc::session::config::{OutputType, OutputTypes, Externs, CodegenOptions};
use rustc::session::search_paths::{SearchPath, PathKind}; use rustc::session::search_paths::SearchPath;
use syntax::ast; use syntax::ast;
use syntax::source_map::SourceMap; use syntax::source_map::SourceMap;
use syntax::edition::Edition; use syntax::edition::Edition;
@ -21,7 +20,6 @@ use tempfile::Builder as TempFileBuilder;
use testing; use testing;
use std::env; use std::env;
use std::ffi::OsString;
use std::io::prelude::*; use std::io::prelude::*;
use std::io; use std::io;
use std::path::PathBuf; use std::path::PathBuf;
@ -265,7 +263,7 @@ fn run_test(test: &str, cratename: &str, filename: &FileName, line: usize,
} }
} }
let (libdir, outdir, compile_result) = driver::spawn_thread_pool(sessopts, |sessopts| { let (outdir, compile_result) = driver::spawn_thread_pool(sessopts, |sessopts| {
let source_map = Lrc::new(SourceMap::new(sessopts.file_path_mapping())); let source_map = Lrc::new(SourceMap::new(sessopts.file_path_mapping()));
let emitter = errors::emitter::EmitterWriter::new(box Sink(data.clone()), let emitter = errors::emitter::EmitterWriter::new(box Sink(data.clone()),
Some(source_map.clone()), Some(source_map.clone()),
@ -304,7 +302,6 @@ fn run_test(test: &str, cratename: &str, filename: &FileName, line: usize,
.expect("rustdoc needs a tempdir")) .expect("rustdoc needs a tempdir"))
} }
); );
let libdir = sess.target_filesearch(PathKind::All).get_lib_path();
let mut control = driver::CompileController::basic(); let mut control = driver::CompileController::basic();
let mut cfg = config::build_configuration(&sess, config::parse_cfgspecs(cfgs.clone())); let mut cfg = config::build_configuration(&sess, config::parse_cfgspecs(cfgs.clone()));
@ -336,7 +333,7 @@ fn run_test(test: &str, cratename: &str, filename: &FileName, line: usize,
Err(_) | Ok(Err(CompileIncomplete::Errored(_))) => Err(()) Err(_) | Ok(Err(CompileIncomplete::Errored(_))) => Err(())
}; };
(libdir, outdir, compile_result) (outdir, compile_result)
}); });
match (compile_result, compile_fail) { match (compile_result, compile_fail) {
@ -362,21 +359,7 @@ fn run_test(test: &str, cratename: &str, filename: &FileName, line: usize,
if no_run { return } if no_run { return }
// Run the code! // Run the code!
//
// We're careful to prepend the *target* dylib search path to the child's
// environment to ensure that the target loads the right libraries at
// runtime. It would be a sad day if the *host* libraries were loaded as a
// mistake.
let mut cmd = Command::new(&outdir.lock().unwrap().path().join("rust_out")); let mut cmd = Command::new(&outdir.lock().unwrap().path().join("rust_out"));
let var = DynamicLibrary::envvar();
let newpath = {
let path = env::var_os(var).unwrap_or(OsString::new());
let mut path = env::split_paths(&path).collect::<Vec<_>>();
path.insert(0, libdir);
env::join_paths(path).unwrap()
};
cmd.env(var, &newpath);
match cmd.output() { match cmd.output() {
Err(e) => panic!("couldn't run the test: {}{}", e, Err(e) => panic!("couldn't run the test: {}{}", e,
if e.kind() == io::ErrorKind::PermissionDenied { if e.kind() == io::ErrorKind::PermissionDenied {

4
src/test/rustdoc-ui/failed-doctest-output.stdout
View file

@ -12,7 +12,7 @@ error[E0425]: cannot find value `no` in this scope
3 | no 3 | no
| ^^ not found in this scope | ^^ not found in this scope
thread '$DIR/failed-doctest-output.rs - OtherStruct (line 17)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:354:13 thread '$DIR/failed-doctest-output.rs - OtherStruct (line 17)' panicked at 'couldn't compile the test', src/librustdoc/test.rs:351:13
note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace. note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
---- $DIR/failed-doctest-output.rs - SomeStruct (line 11) stdout ---- ---- $DIR/failed-doctest-output.rs - SomeStruct (line 11) stdout ----
@ -21,7 +21,7 @@ thread '$DIR/failed-doctest-output.rs - SomeStruct (line 11)' panicked at 'test
thread 'main' panicked at 'oh no', $DIR/failed-doctest-output.rs:3:1 thread 'main' panicked at 'oh no', $DIR/failed-doctest-output.rs:3:1
note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace. note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
', src/librustdoc/test.rs:389:17 ', src/librustdoc/test.rs:372:17
failures: failures: