Skip to content

Commit 445faca

Browse files
alexcrichtonalexcrichton
committed
Test fixes and review feedback
1 parent 2625276 commit 445faca

22 files changed

+64
-48
lines changed

Diff for: ‎src/compiletest/runtest.rs

+15-15
Original file line numberDiff line numberDiff line change
@@ -726,18 +726,18 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
726726
-> ProcRes {
727727
// Prepare the lldb_batchmode which executes the debugger script
728728
let lldb_script_path = rust_src_root.join("src/etc/lldb_batchmode.py");
729-
cmd2proces(config,
730-
test_executable,
731-
Command::new(&config.python)
732-
.arg(&lldb_script_path)
733-
.arg(test_executable)
734-
.arg(debugger_script)
735-
.env("PYTHONPATH",
736-
config.lldb_python_dir.as_ref().unwrap()))
729+
cmd2procres(config,
730+
test_executable,
731+
Command::new(&config.python)
732+
.arg(&lldb_script_path)
733+
.arg(test_executable)
734+
.arg(debugger_script)
735+
.env("PYTHONPATH",
736+
config.lldb_python_dir.as_ref().unwrap()))
737737
}
738738
}
739739

740-
fn cmd2proces(config: &Config, test_executable: &Path, cmd: &mut Command)
740+
fn cmd2procres(config: &Config, test_executable: &Path, cmd: &mut Command)
741741
-> ProcRes {
742742
let (status, out, err) = match cmd.output() {
743743
Ok(Output { status, stdout, stderr }) => {
@@ -1828,12 +1828,12 @@ fn run_rustdoc_test(config: &Config, props: &TestProps, testfile: &Path) {
18281828
}
18291829
let root = find_rust_src_root(config).unwrap();
18301830

1831-
let res = cmd2proces(config,
1832-
testfile,
1833-
Command::new(&config.python)
1834-
.arg(root.join("src/etc/htmldocck.py"))
1835-
.arg(out_dir)
1836-
.arg(testfile));
1831+
let res = cmd2procres(config,
1832+
testfile,
1833+
Command::new(&config.python)
1834+
.arg(root.join("src/etc/htmldocck.py"))
1835+
.arg(out_dir)
1836+
.arg(testfile));
18371837
if !res.status.success() {
18381838
fatal_proc_rec("htmldocck failed!", &res);
18391839
}

Diff for: ‎src/librustdoc/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ fn scrape_test_config(krate: &::syntax::ast::Crate) -> TestOptions {
124124
use syntax::print::pprust;
125125

126126
let mut opts = TestOptions {
127-
no_crate_inject: true,
127+
no_crate_inject: false,
128128
attrs: Vec::new(),
129129
};
130130

Diff for: ‎src/libstd/old_path/mod.rs

+30-30
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
//!
4949
//! ## Examples
5050
//!
51-
//! ```rust
51+
//! ```rust,ignore
5252
//! # #![feature(old_path, old_io)]
5353
//! use std::old_io::fs::PathExtensions;
5454
//! use std::old_path::{Path, GenericPath};
@@ -190,7 +190,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
190190
///
191191
/// # Examples
192192
///
193-
/// ```
193+
/// ```ignore
194194
/// # #![feature(old_path)]
195195
/// use std::old_path::{Path, GenericPath};
196196
/// # foo();
@@ -209,7 +209,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
209209
///
210210
/// # Examples
211211
///
212-
/// ```
212+
/// ```ignore
213213
/// # #![feature(old_path)]
214214
/// use std::old_path::{Path, GenericPath};
215215
/// # foo();
@@ -225,7 +225,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
225225
///
226226
/// # Examples
227227
///
228-
/// ```
228+
/// ```ignore
229229
/// # #![feature(old_path)]
230230
/// use std::old_path::{Path, GenericPath};
231231
/// # foo();
@@ -242,7 +242,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
242242
///
243243
/// # Examples
244244
///
245-
/// ```
245+
/// ```ignore
246246
/// # #![feature(old_path)]
247247
/// use std::old_path::{Path, GenericPath};
248248
/// # foo();
@@ -262,7 +262,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
262262
///
263263
/// # Examples
264264
///
265-
/// ```
265+
/// ```ignore
266266
/// # #![feature(old_path)]
267267
/// use std::old_path::{Path, GenericPath};
268268
/// # foo();
@@ -281,7 +281,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
281281
///
282282
/// # Examples
283283
///
284-
/// ```
284+
/// ```ignore
285285
/// # #![feature(old_path)]
286286
/// use std::old_path::{Path, GenericPath};
287287
/// # foo();
@@ -298,7 +298,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
298298
///
299299
/// # Examples
300300
///
301-
/// ```
301+
/// ```ignore
302302
/// # #![feature(old_path)]
303303
/// use std::old_path::{Path, GenericPath};
304304
/// # foo();
@@ -319,7 +319,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
319319
///
320320
/// # Examples
321321
///
322-
/// ```
322+
/// ```ignore
323323
/// # #![feature(old_path)]
324324
/// use std::old_path::{Path, GenericPath};
325325
/// # foo();
@@ -336,7 +336,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
336336
///
337337
/// # Examples
338338
///
339-
/// ```
339+
/// ```ignore
340340
/// # #![feature(old_path)]
341341
/// use std::old_path::{Path, GenericPath};
342342
/// # foo();
@@ -357,7 +357,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
357357
///
358358
/// # Examples
359359
///
360-
/// ```
360+
/// ```ignore
361361
/// # #![feature(old_path)]
362362
/// use std::old_path::{Path, GenericPath};
363363
/// # foo();
@@ -386,7 +386,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
386386
///
387387
/// # Examples
388388
///
389-
/// ```
389+
/// ```ignore
390390
/// # #![feature(old_path)]
391391
/// use std::old_path::{Path, GenericPath};
392392
/// # foo();
@@ -408,7 +408,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
408408
///
409409
/// # Examples
410410
///
411-
/// ```
411+
/// ```ignore
412412
/// # #![feature(old_path)]
413413
/// use std::old_path::{Path, GenericPath};
414414
/// # foo();
@@ -437,7 +437,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
437437
///
438438
/// # Examples
439439
///
440-
/// ```
440+
/// ```ignore
441441
/// # #![feature(old_path)]
442442
/// use std::old_path::{Path, GenericPath};
443443
/// # foo();
@@ -457,7 +457,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
457457
///
458458
/// # Examples
459459
///
460-
/// ```
460+
/// ```ignore
461461
/// # #![feature(old_path)]
462462
/// use std::old_path::{Path, GenericPath};
463463
/// # foo();
@@ -485,7 +485,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
485485
///
486486
/// # Examples
487487
///
488-
/// ```
488+
/// ```ignore
489489
/// # #![feature(old_path)]
490490
/// use std::old_path::{Path, GenericPath};
491491
/// # foo();
@@ -537,7 +537,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
537537
///
538538
/// # Examples
539539
///
540-
/// ```
540+
/// ```ignore
541541
/// # #![feature(old_path)]
542542
/// use std::old_path::{Path, GenericPath};
543543
/// # foo();
@@ -564,7 +564,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
564564
///
565565
/// # Examples
566566
///
567-
/// ```
567+
/// ```ignore
568568
/// # #![feature(old_path)]
569569
/// use std::old_path::{Path, GenericPath};
570570
/// # foo();
@@ -590,7 +590,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
590590
///
591591
/// # Examples
592592
///
593-
/// ```
593+
/// ```ignore
594594
/// # #![feature(old_path)]
595595
/// use std::old_path::{Path, GenericPath};
596596
/// # foo();
@@ -611,7 +611,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
611611
///
612612
/// # Examples
613613
///
614-
/// ```
614+
/// ```ignore
615615
/// # #![feature(old_path)]
616616
/// use std::old_path::{Path, GenericPath};
617617
/// # foo();
@@ -628,7 +628,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
628628
///
629629
/// # Examples
630630
///
631-
/// ```
631+
/// ```ignore
632632
/// # #![feature(old_path)]
633633
/// use std::old_path::{Path, GenericPath};
634634
/// # foo();
@@ -654,7 +654,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
654654
///
655655
/// # Examples
656656
///
657-
/// ```
657+
/// ```ignore
658658
/// # #![feature(old_path)]
659659
/// use std::old_path::{Path, GenericPath};
660660
/// # foo();
@@ -685,7 +685,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
685685
///
686686
/// # Examples
687687
///
688-
/// ```
688+
/// ```ignore
689689
/// # #![feature(old_path)]
690690
/// use std::old_path::{Path, GenericPath};
691691
/// # foo();
@@ -704,7 +704,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
704704
///
705705
/// # Examples
706706
///
707-
/// ```
707+
/// ```ignore
708708
/// # #![feature(old_path)]
709709
/// use std::old_path::{Path, GenericPath};
710710
/// # foo();
@@ -731,7 +731,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
731731
///
732732
/// # Examples
733733
///
734-
/// ```
734+
/// ```ignore
735735
/// # #![feature(old_path)]
736736
/// use std::old_path::{Path, GenericPath};
737737
/// # foo();
@@ -755,7 +755,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
755755
///
756756
/// # Examples
757757
///
758-
/// ```
758+
/// ```ignore
759759
/// # #![feature(old_path)]
760760
/// use std::old_path::{Path, GenericPath};
761761
/// # foo();
@@ -774,7 +774,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
774774
///
775775
/// # Examples
776776
///
777-
/// ```
777+
/// ```ignore
778778
/// # #![feature(old_path)]
779779
/// use std::old_path::{Path, GenericPath};
780780
/// # foo();
@@ -794,7 +794,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
794794
///
795795
/// # Examples
796796
///
797-
/// ```
797+
/// ```ignore
798798
/// # #![feature(old_path)]
799799
/// use std::old_path::{Path, GenericPath};
800800
/// # foo();
@@ -815,7 +815,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
815815
///
816816
/// # Examples
817817
///
818-
/// ```
818+
/// ```ignore
819819
/// # #![feature(old_path)]
820820
/// use std::old_path::{Path, GenericPath};
821821
/// # foo();
@@ -833,7 +833,7 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
833833
///
834834
/// # Examples
835835
///
836-
/// ```
836+
/// ```ignore
837837
/// # #![feature(old_path)]
838838
/// use std::old_path::{Path, GenericPath};
839839
/// # foo();

Diff for: ‎src/test/run-make/issue-22131/foo.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![crate_name="foo"]
12-
1311
/// ```rust
1412
/// assert_eq!(foo::foo(), 1);
1513
/// ```

Diff for: ‎src/test/rustdoc/default-impl.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:rustdoc-default-impl.rs
12+
// ignore-android
1213

1314
extern crate rustdoc_default_impl as foo;
1415

Diff for: ‎src/test/rustdoc/extern-default-method.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:rustdoc-extern-default-method.rs
12+
// ignore-android
1213

1314
extern crate rustdoc_extern_default_method as ext;
1415

Diff for: ‎src/test/rustdoc/extern-method.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:rustdoc-extern-method.rs
12+
// ignore-android
1213

1314
#![feature(unboxed_closures)]
1415

Diff for: ‎src/test/rustdoc/ffi.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:rustdoc-ffi.rs
12+
// ignore-android
1213

1314
extern crate rustdoc_ffi as lib;
1415

Diff for: ‎src/test/rustdoc/inline-default-methods.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:inline-default-methods.rs
12+
// ignore-android
1213

1314
extern crate inline_default_methods;
1415

Diff for: ‎src/test/rustdoc/issue-13698.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-13698.rs
12+
// ignore-android
1213

1314
extern crate issue_13698;
1415

Diff for: ‎src/test/rustdoc/issue-15318-2.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-15318.rs
12+
// ignore-android
1213

1314
extern crate issue_15318;
1415

Diff for: ‎src/test/rustdoc/issue-15318.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-15318.rs
12+
// ignore-android
1213

1314
#![feature(no_std)]
1415
#![no_std]

0 commit comments

Comments
 (0)