Skip to content

Commit d4cedea

Browse files
committed
Auto merge of #24681 - tamird:unignore-android, r=alexcrichton
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 c48b499 + bd5afb4 commit d4cedea

15 files changed

+72
-61
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)]
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

+3-5
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(#10393)
11+
// ignore-android: FIXME(#10393) hangs without output
1212
// ignore-pretty very bad with line comments
1313

1414
// multi tasking k-nucleotide
1515

16-
#![allow(bad_style)]
17-
1816
use std::ascii::AsciiExt;
1917
use std::cmp::Ordering::{self, Less, Greater, Equal};
2018
use std::collections::HashMap;
@@ -47,7 +45,7 @@ fn sort_and_fmt(mm: &HashMap<Vec<u8> , usize>, total: usize) -> String {
4745
}
4846

4947
// sort by key, then by value
50-
fn sortKV(mut orig: Vec<(Vec<u8> ,f64)> ) -> Vec<(Vec<u8> ,f64)> {
48+
fn sort_kv(mut orig: Vec<(Vec<u8> ,f64)> ) -> Vec<(Vec<u8> ,f64)> {
5149
orig.sort_by(|&(ref a, _), &(ref b, _)| a.cmp(b));
5250
orig.sort_by(|&(_, a), &(_, b)| f64_cmp(b, a));
5351
orig
@@ -60,7 +58,7 @@ fn sort_and_fmt(mm: &HashMap<Vec<u8> , usize>, total: usize) -> String {
6058
pairs.push(((*key).clone(), pct(val, total)));
6159
}
6260

63-
let pairs_sorted = sortKV(pairs);
61+
let pairs_sorted = sort_kv(pairs);
6462

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
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
41+
// ignore-android: FIXME(#10393) hangs without output
4242

4343
#![feature(box_syntax, std_misc, collections)]
4444

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
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
41+
// ignore-android: FIXME(#10393) hangs without output
4242

4343
#![feature(libc, scoped)]
4444

@@ -205,7 +205,7 @@ fn parallel<I: Iterator, F>(iter: I, ref f: F)
205205

206206
fn main() {
207207
let mut data = Vec::with_capacity(1024 * 1024);
208-
io::stdin().read_to_end(&mut data);
208+
io::stdin().read_to_end(&mut data).unwrap();
209209
let tables = &Tables::new();
210210
parallel(mut_dna_seqs(&mut data), |seq| reverse_complement(seq, tables));
211211
io::stdout().write_all(&data).unwrap();

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313

1414
// compile-flags:-g
1515

16-
#![allow(unused_variables)]
17-
#![allow(dead_code)]
16+
#![allow(dead_code, unused_variables)]
1817
#![omit_gdb_pretty_printer_section]
1918
#![feature(std_misc, core)]
2019

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313

1414
// compile-flags:-g
1515

16-
#![allow(unused_variables)]
17-
#![allow(dead_code)]
16+
#![allow(dead_code, unused_variables)]
1817
#![omit_gdb_pretty_printer_section]
1918

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extern crate cross_crate_spans;
2121

2222
// === GDB TESTS ===================================================================================
2323

24-
// gdb-command:break cross_crate_spans.rs:21
24+
// gdb-command:break cross_crate_spans.rs:23
2525
// gdb-command:run
2626

2727
// gdb-command:print result
@@ -44,7 +44,7 @@ extern crate cross_crate_spans;
4444

4545
// === LLDB TESTS ==================================================================================
4646

47-
// lldb-command:b cross_crate_spans.rs:21
47+
// lldb-command:b cross_crate_spans.rs:23
4848
// lldb-command:run
4949

5050
// lldb-command:print result

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
// lldb-check:[...]$31 = 45
247247
// lldb-command:continue
248248

249-
#![allow(unused_variables)]
249+
#![allow(dead_code, unused_assignments, unused_variables)]
250250
#![omit_gdb_pretty_printer_section]
251251

252252
#[no_stack_check]

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

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
// gdb-command: print none
3636
// gdb-check:$6 = None
3737

38+
#![allow(unused_variables)]
39+
3840
fn main() {
3941

4042
// &[]

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

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
// gdb-command: print c_style_enum3
3838
// gdb-check:$5 = CStyleEnumVar3
3939

40+
#![allow(dead_code, unused_variables)]
41+
4042
struct RegularStruct {
4143
the_first_field: isize,
4244
the_second_field: f64,

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

+2
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@
7676
// gdb-command: print none_check2
7777
// gdb-check:$18 = None
7878

79+
#![allow(dead_code, unused_variables)]
80+
7981
use self::CStyleEnum::{CStyleEnumVar1, CStyleEnumVar2, CStyleEnumVar3};
8082
use self::MixedEnum::{MixedEnumCStyleVar, MixedEnumTupleVar, MixedEnumStructVar};
8183
use self::NestedEnum::{NestedVariant1, NestedVariant2};

0 commit comments

Comments
 (0)