]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #21774 - ejjeong:enable-test-for-android, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 17 Feb 2015 19:35:12 +0000 (19:35 +0000)
committerbors <bors@rust-lang.org>
Tue, 17 Feb 2015 19:35:12 +0000 (19:35 +0000)
- Now "make check-stage2-T-aarch64-linux-android-H-x86_64-unknown-linux-gnu" works (#21773)
- Fix & enable debuginfo tests for android (#10381)
- Fix & enable more tests for android (both for arm/aarch64)
- Enable many already-pass tests on android (both for arm/aarch64)

13 files changed:
1  2 
mk/tests.mk
src/compiletest/compiletest.rs
src/liblibc/lib.rs
src/librustc_back/target/mod.rs
src/libstd/sys/unix/process.rs
src/test/compile-fail-fulldeps/macro-crate-cannot-read-embedded-ident.rs
src/test/compile-fail-fulldeps/plugin-MacroRulesTT.rs
src/test/debuginfo/basic-types-globals-metadata.rs
src/test/debuginfo/basic-types-globals.rs
src/test/debuginfo/destructured-fn-argument.rs
src/test/debuginfo/destructured-for-loop-variable.rs
src/test/debuginfo/destructured-local.rs
src/test/run-pass-fulldeps/issue_16723_multiple_items_syntax_ext.rs

diff --cc mk/tests.mk
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index c59a3589c04af3eded86a01ca5d88d38038e6e55,101e00bca4b5075703d52c8342cf3d913fdf564b..c1ffeb7c8e2e96d9262e90d5a84f572545d9f685
@@@ -9,10 -9,10 +9,9 @@@
  // except according to those terms.
  
  // ignore-stage1
- // ignore-android
  // aux-build:issue_16723_multiple_items_syntax_ext.rs
  #![feature(plugin)]
 -
 -#[plugin] #[no_link] extern crate issue_16723_multiple_items_syntax_ext;
 +#![plugin(issue_16723_multiple_items_syntax_ext)]
  
  multiple_items!();