182c96c921
This pull request fixes #12881. Two caveats: 1. As explained in the commit message, this doesn't include a regression test. If this is unacceptable, please let me know, I'll see what I can do. 1. I'm getting some test failures on make check, all from debuginfo. I suspect this is due to #13680 and not related to my changes (I have GDB 7.7). This is the list of failed tests: > [debuginfo-gdb] debuginfo/basic-types-globals.rs > [debuginfo-gdb] debuginfo/basic-types-mut-globals.rs > [debuginfo-gdb] debuginfo/basic-types.rs > [debuginfo-gdb] debuginfo/borrowed-basic.rs > [debuginfo-gdb] debuginfo/borrowed-managed-basic.rs > [debuginfo-gdb] debuginfo/borrowed-struct.rs > [debuginfo-gdb] debuginfo/borrowed-unique-basic.rs > [debuginfo-gdb] debuginfo/box.rs > [debuginfo-gdb] debuginfo/by-value-non-immediate-argument.rs > [debuginfo-gdb] debuginfo/by-value-self-argument-in-trait-impl.rs > [debuginfo-gdb] debuginfo/closure-in-generic-function.rs > [debuginfo-gdb] debuginfo/evec-in-struct.rs > [debuginfo-gdb] debuginfo/function-arg-initialization.rs > [debuginfo-gdb] debuginfo/function-prologue-stepping-no-split-stack.rs > [debuginfo-gdb] debuginfo/generic-function.rs > [debuginfo-gdb] debuginfo/generic-functions-nested.rs > [debuginfo-gdb] debuginfo/generic-method-on-generic-struct.rs > [debuginfo-gdb] debuginfo/generic-static-method-on-struct-and-enum.rs > [debuginfo-gdb] debuginfo/generic-struct.rs > [debuginfo-gdb] debuginfo/lexical-scope-in-stack-closure.rs > [debuginfo-gdb] debuginfo/lexical-scope-in-unique-closure.rs > [debuginfo-gdb] debuginfo/method-on-generic-struct.rs > [debuginfo-gdb] debuginfo/method-on-tuple-struct.rs > [debuginfo-gdb] debuginfo/name-shadowing-and-scope-nesting.rs > [debuginfo-gdb] debuginfo/recursive-struct.rs > [debuginfo-gdb] debuginfo/self-in-generic-default-method.rs > [debuginfo-gdb] debuginfo/shadowed-argument.rs > [debuginfo-gdb] debuginfo/shadowed-variable.rs > [debuginfo-gdb] debuginfo/simd.rs > [debuginfo-gdb] debuginfo/simple-lexical-scope.rs > [debuginfo-gdb] debuginfo/simple-struct.rs > [debuginfo-gdb] debuginfo/simple-tuple.rs > [debuginfo-gdb] debuginfo/static-method-on-struct-and-enum.rs > [debuginfo-gdb] debuginfo/tuple-struct.rs > [debuginfo-gdb] debuginfo/var-captured-in-nested-closure.rs > [debuginfo-gdb] debuginfo/var-captured-in-sendable-closure.rs > [debuginfo-gdb] debuginfo/var-captured-in-stack-closure.rs I can provide the full output on request.
300 lines
10 KiB
Rust
300 lines
10 KiB
Rust
// Copyright 2013-2014 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::cell::RefCell;
|
|
use std::char;
|
|
use std::io;
|
|
use std::io::{Command, TempDir};
|
|
use std::os;
|
|
use std::str;
|
|
use std::strbuf::StrBuf;
|
|
|
|
use collections::{HashSet, HashMap};
|
|
use testing;
|
|
use rustc::back::link;
|
|
use rustc::driver::config;
|
|
use rustc::driver::driver;
|
|
use rustc::driver::session;
|
|
use rustc::metadata::creader::Loader;
|
|
use syntax::ast;
|
|
use syntax::codemap::{CodeMap, dummy_spanned};
|
|
use syntax::diagnostic;
|
|
use syntax::parse::token;
|
|
|
|
use core;
|
|
use clean;
|
|
use clean::Clean;
|
|
use fold::DocFolder;
|
|
use html::markdown;
|
|
use passes;
|
|
use visit_ast::RustdocVisitor;
|
|
|
|
pub fn run(input: &str,
|
|
cfgs: Vec<StrBuf>,
|
|
libs: HashSet<Path>,
|
|
mut test_args: Vec<StrBuf>)
|
|
-> int {
|
|
let input_path = Path::new(input);
|
|
let input = driver::FileInput(input_path.clone());
|
|
|
|
let sessopts = config::Options {
|
|
maybe_sysroot: Some(os::self_exe_path().unwrap().dir_path()),
|
|
addl_lib_search_paths: RefCell::new(libs.clone()),
|
|
crate_types: vec!(config::CrateTypeDylib),
|
|
..config::basic_options().clone()
|
|
};
|
|
|
|
|
|
let codemap = CodeMap::new();
|
|
let diagnostic_handler = diagnostic::default_handler(diagnostic::Auto);
|
|
let span_diagnostic_handler =
|
|
diagnostic::mk_span_handler(diagnostic_handler, codemap);
|
|
|
|
let sess = session::build_session_(sessopts,
|
|
Some(input_path.clone()),
|
|
span_diagnostic_handler);
|
|
|
|
let mut cfg = config::build_configuration(&sess);
|
|
cfg.extend(cfgs.move_iter().map(|cfg_| {
|
|
let cfg_ = token::intern_and_get_ident(cfg_.as_slice());
|
|
@dummy_spanned(ast::MetaWord(cfg_))
|
|
}));
|
|
let krate = driver::phase_1_parse_input(&sess, cfg, &input);
|
|
let (krate, _) = driver::phase_2_configure_and_expand(&sess, &mut Loader::new(&sess), krate,
|
|
&from_str("rustdoc-test").unwrap());
|
|
|
|
let ctx = @core::DocContext {
|
|
krate: krate,
|
|
maybe_typed: core::NotTyped(sess),
|
|
src: input_path,
|
|
external_paths: RefCell::new(Some(HashMap::new())),
|
|
};
|
|
super::ctxtkey.replace(Some(ctx));
|
|
|
|
let mut v = RustdocVisitor::new(ctx, None);
|
|
v.visit(&ctx.krate);
|
|
let krate = v.clean();
|
|
let (krate, _) = passes::unindent_comments(krate);
|
|
let (krate, _) = passes::collapse_docs(krate);
|
|
|
|
let mut collector = Collector::new(krate.name.to_strbuf(),
|
|
libs,
|
|
false,
|
|
false);
|
|
collector.fold_crate(krate);
|
|
|
|
test_args.unshift("rustdoctest".to_strbuf());
|
|
|
|
testing::test_main(test_args.as_slice(),
|
|
collector.tests.move_iter().collect());
|
|
0
|
|
}
|
|
|
|
fn runtest(test: &str, cratename: &str, libs: HashSet<Path>, should_fail: bool,
|
|
no_run: bool, loose_feature_gating: bool) {
|
|
let test = maketest(test, cratename, loose_feature_gating);
|
|
let input = driver::StrInput(test.to_strbuf());
|
|
|
|
let sessopts = config::Options {
|
|
maybe_sysroot: Some(os::self_exe_path().unwrap().dir_path()),
|
|
addl_lib_search_paths: RefCell::new(libs),
|
|
crate_types: vec!(config::CrateTypeExecutable),
|
|
output_types: vec!(link::OutputTypeExe),
|
|
no_trans: no_run,
|
|
cg: config::CodegenOptions {
|
|
prefer_dynamic: true,
|
|
.. config::basic_codegen_options()
|
|
},
|
|
..config::basic_options().clone()
|
|
};
|
|
|
|
// Shuffle around a few input and output handles here. We're going to pass
|
|
// an explicit handle into rustc to collect output messages, but we also
|
|
// want to catch the error message that rustc prints when it fails.
|
|
//
|
|
// We take our task-local stderr (likely set by the test runner), and move
|
|
// it into another task. This helper task then acts as a sink for both the
|
|
// stderr of this task and stderr of rustc itself, copying all the info onto
|
|
// the stderr channel we originally started with.
|
|
//
|
|
// The basic idea is to not use a default_handler() for rustc, and then also
|
|
// not print things by default to the actual stderr.
|
|
let (tx, rx) = channel();
|
|
let w1 = io::ChanWriter::new(tx);
|
|
let w2 = w1.clone();
|
|
let old = io::stdio::set_stderr(box w1);
|
|
spawn(proc() {
|
|
let mut p = io::ChanReader::new(rx);
|
|
let mut err = old.unwrap_or(box io::stderr() as Box<Writer:Send>);
|
|
io::util::copy(&mut p, &mut err).unwrap();
|
|
});
|
|
let emitter = diagnostic::EmitterWriter::new(box w2);
|
|
|
|
// Compile the code
|
|
let codemap = CodeMap::new();
|
|
let diagnostic_handler = diagnostic::mk_handler(box emitter);
|
|
let span_diagnostic_handler =
|
|
diagnostic::mk_span_handler(diagnostic_handler, codemap);
|
|
|
|
let sess = session::build_session_(sessopts,
|
|
None,
|
|
span_diagnostic_handler);
|
|
|
|
let outdir = TempDir::new("rustdoctest").expect("rustdoc needs a tempdir");
|
|
let out = Some(outdir.path().clone());
|
|
let cfg = config::build_configuration(&sess);
|
|
driver::compile_input(sess, cfg, &input, &out, &None);
|
|
|
|
if no_run { return }
|
|
|
|
// Run the code!
|
|
match Command::new(outdir.path().join("rust_out")).output() {
|
|
Err(e) => fail!("couldn't run the test: {}{}", e,
|
|
if e.kind == io::PermissionDenied {
|
|
" - maybe your tempdir is mounted with noexec?"
|
|
} else { "" }),
|
|
Ok(out) => {
|
|
if should_fail && out.status.success() {
|
|
fail!("test executable succeeded when it should have failed");
|
|
} else if !should_fail && !out.status.success() {
|
|
fail!("test executable failed:\n{}",
|
|
str::from_utf8(out.error.as_slice()));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn maketest(s: &str, cratename: &str, loose_feature_gating: bool) -> StrBuf {
|
|
let mut prog = StrBuf::from_str(r"
|
|
#![deny(warnings)]
|
|
#![allow(unused_variable, dead_assignment, unused_mut, attribute_usage, dead_code)]
|
|
");
|
|
|
|
if loose_feature_gating {
|
|
// FIXME #12773: avoid inserting these when the tutorial & manual
|
|
// etc. have been updated to not use them so prolifically.
|
|
prog.push_str("#![feature(macro_rules, globs, struct_variant, managed_boxes) ]\n");
|
|
}
|
|
|
|
if !s.contains("extern crate") {
|
|
if s.contains(cratename) {
|
|
prog.push_str(format!("extern crate {};\n", cratename));
|
|
}
|
|
}
|
|
if s.contains("fn main") {
|
|
prog.push_str(s);
|
|
} else {
|
|
prog.push_str("fn main() {\n");
|
|
prog.push_str(s);
|
|
prog.push_str("\n}");
|
|
}
|
|
|
|
return prog
|
|
}
|
|
|
|
pub struct Collector {
|
|
pub tests: Vec<testing::TestDescAndFn>,
|
|
names: Vec<StrBuf>,
|
|
libs: HashSet<Path>,
|
|
cnt: uint,
|
|
use_headers: bool,
|
|
current_header: Option<StrBuf>,
|
|
cratename: StrBuf,
|
|
|
|
loose_feature_gating: bool
|
|
}
|
|
|
|
impl Collector {
|
|
pub fn new(cratename: StrBuf, libs: HashSet<Path>,
|
|
use_headers: bool, loose_feature_gating: bool) -> Collector {
|
|
Collector {
|
|
tests: Vec::new(),
|
|
names: Vec::new(),
|
|
libs: libs,
|
|
cnt: 0,
|
|
use_headers: use_headers,
|
|
current_header: None,
|
|
cratename: cratename,
|
|
|
|
loose_feature_gating: loose_feature_gating
|
|
}
|
|
}
|
|
|
|
pub fn add_test(&mut self, test: StrBuf, should_fail: bool, no_run: bool, should_ignore: bool) {
|
|
let name = if self.use_headers {
|
|
let s = self.current_header.as_ref().map(|s| s.as_slice()).unwrap_or("");
|
|
format_strbuf!("{}_{}", s, self.cnt)
|
|
} else {
|
|
format_strbuf!("{}_{}", self.names.connect("::"), self.cnt)
|
|
};
|
|
self.cnt += 1;
|
|
let libs = self.libs.clone();
|
|
let cratename = self.cratename.to_owned();
|
|
let loose_feature_gating = self.loose_feature_gating;
|
|
debug!("Creating test {}: {}", name, test);
|
|
self.tests.push(testing::TestDescAndFn {
|
|
desc: testing::TestDesc {
|
|
name: testing::DynTestName(name),
|
|
ignore: should_ignore,
|
|
should_fail: false, // compiler failures are test failures
|
|
},
|
|
testfn: testing::DynTestFn(proc() {
|
|
runtest(test.as_slice(),
|
|
cratename,
|
|
libs,
|
|
should_fail,
|
|
no_run,
|
|
loose_feature_gating);
|
|
}),
|
|
});
|
|
}
|
|
|
|
pub fn register_header(&mut self, name: &str, level: u32) {
|
|
if self.use_headers && level == 1 {
|
|
// we use these headings as test names, so it's good if
|
|
// they're valid identifiers.
|
|
let name = name.chars().enumerate().map(|(i, c)| {
|
|
if (i == 0 && char::is_XID_start(c)) ||
|
|
(i != 0 && char::is_XID_continue(c)) {
|
|
c
|
|
} else {
|
|
'_'
|
|
}
|
|
}).collect::<StrBuf>();
|
|
|
|
// new header => reset count.
|
|
self.cnt = 0;
|
|
self.current_header = Some(name);
|
|
}
|
|
}
|
|
}
|
|
|
|
impl DocFolder for Collector {
|
|
fn fold_item(&mut self, item: clean::Item) -> Option<clean::Item> {
|
|
let pushed = match item.name {
|
|
Some(ref name) if name.len() == 0 => false,
|
|
Some(ref name) => { self.names.push(name.to_strbuf()); true }
|
|
None => false
|
|
};
|
|
match item.doc_value() {
|
|
Some(doc) => {
|
|
self.cnt = 0;
|
|
markdown::find_testable_code(doc, &mut *self);
|
|
}
|
|
None => {}
|
|
}
|
|
let ret = self.fold_item_recur(item);
|
|
if pushed {
|
|
self.names.pop();
|
|
}
|
|
return ret;
|
|
}
|
|
}
|