Skip to content

Commit 43dd852

Browse files
committedApr 22, 2015
Auto merge of #24681 - tamird:unignore-android, r=<try>
There are still quite a few ignored Android tests kicking around, most of which were added in 445faca, which has a pretty unfortunate commit message. r? @alexcrichton
2 parents 2baf348 + 1af79c6 commit 43dd852

16 files changed

+66
-74
lines changed
 

‎src/test/auxiliary/cross_crate_spans.rs

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

1111
#![crate_type = "rlib"]
12+
13+
#![allow(unused_variables)]
1214
#![omit_gdb_pretty_printer_section]
1315

1416
// no-prefer-dynamic

‎src/test/auxiliary/linkage-visibility.rs

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010

1111
#![feature(std_misc, old_path)]
1212

13+
// We're testing linkage visibility; the compiler warns us, but we want to
14+
// do the runtime check that these functions aren't exported.
15+
#![allow(private_no_mangle_fns)]
16+
1317
use std::dynamic_lib::DynamicLibrary;
1418

1519
#[no_mangle]
@@ -25,6 +29,7 @@ pub fn foo2<T>() {
2529
#[no_mangle]
2630
fn bar() { }
2731

32+
#[allow(dead_code)]
2833
#[no_mangle]
2934
fn baz() { }
3035

‎src/test/bench/shootout-k-nucleotide-pipes.rs

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

11-
// ignore-android: FIXME(#10393)
12-
// ignore-pretty very bad with line comments
13-
1411
// multi tasking k-nucleotide
1512

16-
#![allow(bad_style)]
17-
1813
use std::ascii::AsciiExt;
1914
use std::cmp::Ordering::{self, Less, Greater, Equal};
2015
use std::collections::HashMap;
@@ -47,7 +42,7 @@ fn sort_and_fmt(mm: &HashMap<Vec<u8> , usize>, total: usize) -> String {
4742
}
4843

4944
// sort by key, then by value
50-
fn sortKV(mut orig: Vec<(Vec<u8> ,f64)> ) -> Vec<(Vec<u8> ,f64)> {
45+
fn sort_kv(mut orig: Vec<(Vec<u8> ,f64)> ) -> Vec<(Vec<u8> ,f64)> {
5146
orig.sort_by(|&(ref a, _), &(ref b, _)| a.cmp(b));
5247
orig.sort_by(|&(_, a), &(_, b)| f64_cmp(b, a));
5348
orig
@@ -60,7 +55,7 @@ fn sort_and_fmt(mm: &HashMap<Vec<u8> , usize>, total: usize) -> String {
6055
pairs.push(((*key).clone(), pct(val, total)));
6156
}
6257

63-
let pairs_sorted = sortKV(pairs);
58+
let pairs_sorted = sort_kv(pairs);
6459

6560
let mut buffer = String::new();
6661
for &(ref k, v) in &pairs_sorted {

‎src/test/bench/shootout-k-nucleotide.rs

-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
3939
// OF THE POSSIBILITY OF SUCH DAMAGE.
4040

41-
// ignore-android see #10393 #13206
42-
4341
#![feature(box_syntax, std_misc, collections)]
4442

4543
use std::ascii::OwnedAsciiExt;

‎src/test/bench/shootout-reverse-complement.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
3939
// OF THE POSSIBILITY OF SUCH DAMAGE.
4040

41-
// ignore-android see #10393 #13206
42-
4341
#![feature(libc, scoped)]
4442

4543
extern crate libc;
@@ -205,7 +203,7 @@ fn parallel<I: Iterator, F>(iter: I, ref f: F)
205203

206204
fn main() {
207205
let mut data = Vec::with_capacity(1024 * 1024);
208-
io::stdin().read_to_end(&mut data);
206+
io::stdin().read_to_end(&mut data).unwrap();
209207
let tables = &Tables::new();
210208
parallel(mut_dna_seqs(&mut data), |seq| reverse_complement(seq, tables));
211209
io::stdout().write_all(&data).unwrap();

‎src/test/debuginfo/constant-debug-locs.rs

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

11-
// ignore-android: FIXME(#10381)
1211
// min-lldb-version: 310
1312

1413
// compile-flags:-g
1514

16-
#![allow(unused_variables)]
17-
#![allow(dead_code)]
15+
#![allow(dead_code, unused_variables)]
1816
#![omit_gdb_pretty_printer_section]
1917
#![feature(std_misc, core)]
2018

‎src/test/debuginfo/constant-in-match-pattern.rs

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

11-
// ignore-android: FIXME(#10381)
1211
// min-lldb-version: 310
1312

1413
// compile-flags:-g
1514

16-
#![allow(unused_variables)]
17-
#![allow(dead_code)]
15+
#![allow(dead_code, unused_variables)]
1816
#![omit_gdb_pretty_printer_section]
1917

2018
// This test makes sure that the compiler doesn't crash when trying to assign

‎src/test/debuginfo/cross-crate-spans.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#![omit_gdb_pretty_printer_section]
1212

13-
// ignore-android: FIXME(#10381)
1413
// min-lldb-version: 310
1514

1615
// aux-build:cross_crate_spans.rs

‎src/test/debuginfo/function-prologue-stepping-no-stack-check.rs

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

11-
// ignore-android: FIXME(#10381)
1211
// min-lldb-version: 310
1312

1413
// This test case checks if function arguments already have the correct value
@@ -246,7 +245,7 @@
246245
// lldb-check:[...]$31 = 45
247246
// lldb-command:continue
248247

249-
#![allow(unused_variables)]
248+
#![allow(dead_code, unused_assignments, unused_variables)]
250249
#![omit_gdb_pretty_printer_section]
251250

252251
#[no_stack_check]

‎src/test/debuginfo/gdb-pretty-std.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
// ignore-windows failing on win32 bot
1212
// ignore-freebsd: gdb package too new
1313
// ignore-lldb
14-
// ignore-android: FIXME(#10381)
1514
// compile-flags:-g
1615
// min-gdb-version 7.7
1716

@@ -35,6 +34,8 @@
3534
// gdb-command: print none
3635
// gdb-check:$6 = None
3736

37+
#![allow(unused_variables)]
38+
3839
fn main() {
3940

4041
// &[]

‎src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
// ignore-freebsd: gdb package too new
1818
// ignore-tidy-linelength
1919
// ignore-lldb
20-
// ignore-android: FIXME(#10381)
2120
// compile-flags:-g
2221

2322
// gdb-command: run
@@ -37,6 +36,8 @@
3736
// gdb-command: print c_style_enum3
3837
// gdb-check:$5 = CStyleEnumVar3
3938

39+
#![allow(dead_code, unused_variables)]
40+
4041
struct RegularStruct {
4142
the_first_field: isize,
4243
the_second_field: f64,

‎src/test/debuginfo/gdb-pretty-struct-and-enums.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
// ignore-freebsd: output doesn't match
1313
// ignore-tidy-linelength
1414
// ignore-lldb
15-
// ignore-android: FIXME(#10381)
1615
// compile-flags:-g
1716

1817
// This test uses some GDB Python API features (e.g. accessing anonymous fields)
@@ -76,6 +75,8 @@
7675
// gdb-command: print none_check2
7776
// gdb-check:$18 = None
7877

78+
#![allow(dead_code, unused_variables)]
79+
7980
use self::CStyleEnum::{CStyleEnumVar1, CStyleEnumVar2, CStyleEnumVar3};
8081
use self::MixedEnum::{MixedEnumCStyleVar, MixedEnumTupleVar, MixedEnumStructVar};
8182
use self::NestedEnum::{NestedVariant1, NestedVariant2};

0 commit comments

Comments
 (0)
Please sign in to comment.