From 445faca8441aae34c91318b6ad9e2049885af8dc Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 7 Apr 2015 20:11:59 -0700 Subject: [PATCH] Test fixes and review feedback --- src/compiletest/runtest.rs | 30 +++++------ src/librustdoc/test.rs | 2 +- src/libstd/old_path/mod.rs | 60 +++++++++++----------- src/test/run-make/issue-22131/foo.rs | 2 - src/test/rustdoc/default-impl.rs | 1 + src/test/rustdoc/extern-default-method.rs | 1 + src/test/rustdoc/extern-method.rs | 1 + src/test/rustdoc/ffi.rs | 1 + src/test/rustdoc/inline-default-methods.rs | 1 + src/test/rustdoc/issue-13698.rs | 1 + src/test/rustdoc/issue-15318-2.rs | 1 + src/test/rustdoc/issue-15318.rs | 1 + src/test/rustdoc/issue-17476.rs | 1 + src/test/rustdoc/issue-20646.rs | 1 + src/test/rustdoc/issue-20727-2.rs | 1 + src/test/rustdoc/issue-20727-3.rs | 1 + src/test/rustdoc/issue-20727-4.rs | 1 + src/test/rustdoc/issue-20727.rs | 1 + src/test/rustdoc/issue-21092.rs | 1 + src/test/rustdoc/issue-21801.rs | 1 + src/test/rustdoc/issue-22025.rs | 1 + src/test/rustdoc/issue-23207.rs | 1 + 22 files changed, 64 insertions(+), 48 deletions(-) diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index 9d040fc8594..daa53e2dbd5 100644 --- 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 index ffb2bb12540..94b521a89cf 100644 --- 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/libstd/old_path/mod.rs b/src/libstd/old_path/mod.rs index 22561c96f63..2dee90e9a66 100644 --- a/src/libstd/old_path/mod.rs +++ b/src/libstd/old_path/mod.rs @@ -48,7 +48,7 @@ //! //! ## Examples //! -//! ```rust +//! ```rust,ignore //! # #![feature(old_path, old_io)] //! use std::old_io::fs::PathExtensions; //! use std::old_path::{Path, GenericPath}; @@ -190,7 +190,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -209,7 +209,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -225,7 +225,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -242,7 +242,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -262,7 +262,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -281,7 +281,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -298,7 +298,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -319,7 +319,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -336,7 +336,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -357,7 +357,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -386,7 +386,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -408,7 +408,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -437,7 +437,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -457,7 +457,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -485,7 +485,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -537,7 +537,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -564,7 +564,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -590,7 +590,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -611,7 +611,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -628,7 +628,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -654,7 +654,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -685,7 +685,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -704,7 +704,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -731,7 +731,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -755,7 +755,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -774,7 +774,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -794,7 +794,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -815,7 +815,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); @@ -833,7 +833,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe { /// /// # Examples /// - /// ``` + /// ```ignore /// # #![feature(old_path)] /// use std::old_path::{Path, GenericPath}; /// # foo(); diff --git a/src/test/run-make/issue-22131/foo.rs b/src/test/run-make/issue-22131/foo.rs index 0b1f1291df0..50c63abc0d4 100644 --- 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); /// ``` diff --git a/src/test/rustdoc/default-impl.rs b/src/test/rustdoc/default-impl.rs index 0539ecae99d..92b24314002 100644 --- a/src/test/rustdoc/default-impl.rs +++ b/src/test/rustdoc/default-impl.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:rustdoc-default-impl.rs +// ignore-android extern crate rustdoc_default_impl as foo; diff --git a/src/test/rustdoc/extern-default-method.rs b/src/test/rustdoc/extern-default-method.rs index c40c46df9fe..9178c1bcb9d 100644 --- a/src/test/rustdoc/extern-default-method.rs +++ b/src/test/rustdoc/extern-default-method.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:rustdoc-extern-default-method.rs +// ignore-android extern crate rustdoc_extern_default_method as ext; diff --git a/src/test/rustdoc/extern-method.rs b/src/test/rustdoc/extern-method.rs index 2943bd8507b..5e30e6c0c1c 100644 --- a/src/test/rustdoc/extern-method.rs +++ b/src/test/rustdoc/extern-method.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:rustdoc-extern-method.rs +// ignore-android #![feature(unboxed_closures)] diff --git a/src/test/rustdoc/ffi.rs b/src/test/rustdoc/ffi.rs index 8ccc6a0f2fb..717c64b3aa5 100644 --- a/src/test/rustdoc/ffi.rs +++ b/src/test/rustdoc/ffi.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:rustdoc-ffi.rs +// ignore-android extern crate rustdoc_ffi as lib; diff --git a/src/test/rustdoc/inline-default-methods.rs b/src/test/rustdoc/inline-default-methods.rs index 5e958e333bb..a613736ab4c 100644 --- a/src/test/rustdoc/inline-default-methods.rs +++ b/src/test/rustdoc/inline-default-methods.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:inline-default-methods.rs +// ignore-android extern crate inline_default_methods; diff --git a/src/test/rustdoc/issue-13698.rs b/src/test/rustdoc/issue-13698.rs index 81cee0998ab..5c31c297724 100644 --- a/src/test/rustdoc/issue-13698.rs +++ b/src/test/rustdoc/issue-13698.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:issue-13698.rs +// ignore-android extern crate issue_13698; diff --git a/src/test/rustdoc/issue-15318-2.rs b/src/test/rustdoc/issue-15318-2.rs index 29a8b4cea4c..32898d652f8 100644 --- a/src/test/rustdoc/issue-15318-2.rs +++ b/src/test/rustdoc/issue-15318-2.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:issue-15318.rs +// ignore-android extern crate issue_15318; diff --git a/src/test/rustdoc/issue-15318.rs b/src/test/rustdoc/issue-15318.rs index 86a0b1d72a3..3bcc8f45b0e 100644 --- a/src/test/rustdoc/issue-15318.rs +++ b/src/test/rustdoc/issue-15318.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:issue-15318.rs +// ignore-android #![feature(no_std)] #![no_std] diff --git a/src/test/rustdoc/issue-17476.rs b/src/test/rustdoc/issue-17476.rs index 069422171bd..8d31a1c288e 100644 --- a/src/test/rustdoc/issue-17476.rs +++ b/src/test/rustdoc/issue-17476.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:issue-17476.rs +// ignore-android extern crate issue_17476; diff --git a/src/test/rustdoc/issue-20646.rs b/src/test/rustdoc/issue-20646.rs index d2ba85651d8..77abe35948c 100644 --- a/src/test/rustdoc/issue-20646.rs +++ b/src/test/rustdoc/issue-20646.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:issue-20646.rs +// ignore-android #![feature(associated_types)] diff --git a/src/test/rustdoc/issue-20727-2.rs b/src/test/rustdoc/issue-20727-2.rs index e0122d66de1..03181bebdb0 100644 --- a/src/test/rustdoc/issue-20727-2.rs +++ b/src/test/rustdoc/issue-20727-2.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:issue-20727.rs +// ignore-android extern crate issue_20727; diff --git a/src/test/rustdoc/issue-20727-3.rs b/src/test/rustdoc/issue-20727-3.rs index 8338239a29d..9d05ce99c4d 100644 --- a/src/test/rustdoc/issue-20727-3.rs +++ b/src/test/rustdoc/issue-20727-3.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:issue-20727.rs +// ignore-android extern crate issue_20727; diff --git a/src/test/rustdoc/issue-20727-4.rs b/src/test/rustdoc/issue-20727-4.rs index ed361ed990a..39db387f090 100644 --- a/src/test/rustdoc/issue-20727-4.rs +++ b/src/test/rustdoc/issue-20727-4.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:issue-20727.rs +// ignore-android extern crate issue_20727; diff --git a/src/test/rustdoc/issue-20727.rs b/src/test/rustdoc/issue-20727.rs index 9903ad34b4c..3205f5bfa33 100644 --- a/src/test/rustdoc/issue-20727.rs +++ b/src/test/rustdoc/issue-20727.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:issue-20727.rs +// ignore-android extern crate issue_20727; diff --git a/src/test/rustdoc/issue-21092.rs b/src/test/rustdoc/issue-21092.rs index 30d61d76ab3..38983aee933 100644 --- a/src/test/rustdoc/issue-21092.rs +++ b/src/test/rustdoc/issue-21092.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:issue-21092.rs +// ignore-android extern crate issue_21092; diff --git a/src/test/rustdoc/issue-21801.rs b/src/test/rustdoc/issue-21801.rs index 00b46638b29..a4392b84e5b 100644 --- a/src/test/rustdoc/issue-21801.rs +++ b/src/test/rustdoc/issue-21801.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:issue-21801.rs +// ignore-android extern crate issue_21801; diff --git a/src/test/rustdoc/issue-22025.rs b/src/test/rustdoc/issue-22025.rs index 544dad07cda..d2eb4fb6ad8 100644 --- a/src/test/rustdoc/issue-22025.rs +++ b/src/test/rustdoc/issue-22025.rs @@ -9,6 +9,7 @@ // except according to those terms. // aux-build:issue-22025.rs +// ignore-android extern crate issue_22025; diff --git a/src/test/rustdoc/issue-23207.rs b/src/test/rustdoc/issue-23207.rs index a44a1dd8b2d..722046723be 100644 --- a/src/test/rustdoc/issue-23207.rs +++ b/src/test/rustdoc/issue-23207.rs @@ -10,6 +10,7 @@ // aux-build:issue-23207-1.rs // aux-build:issue-23207-2.rs +// ignore-android extern crate issue_23207_2;