diff options
114 files changed, 91 insertions, 156 deletions
diff --git a/mk/install.mk b/mk/install.mk index 60c0a6bb4c7..8850cd77803 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -58,14 +58,13 @@ tmp/empty_dir: # Android runtime setup # FIXME: This probably belongs somewhere else -# target platform specific variables -# for arm-linux-androidabi +# target platform specific variables for android define DEF_ADB_DEVICE_STATUS CFG_ADB_DEVICE_STATUS=$(1) endef $(foreach target,$(CFG_TARGET), \ - $(if $(findstring $(target),"arm-linux-androideabi"), \ + $(if $(findstring android, $(target)), \ $(if $(findstring adb,$(CFG_ADB)), \ $(if $(findstring device,$(shell $(CFG_ADB) devices 2>/dev/null | grep -E '^[_A-Za-z0-9-]+[[:blank:]]+device')), \ $(info install: install-runtime-target for $(target) enabled \ @@ -117,8 +116,11 @@ install-runtime-target-$(1)-cleanup: $$(call ADB_SHELL,rm,$$(CFG_RUNTIME_PUSH_DIR)/$$(call CFG_LIB_GLOB_$(1),$$(crate)));) endef -$(eval $(call INSTALL_RUNTIME_TARGET_N,arm-linux-androideabi,$(CFG_BUILD))) -$(eval $(call INSTALL_RUNTIME_TARGET_CLEANUP_N,arm-linux-androideabi)) +$(foreach target,$(CFG_TARGET), \ + $(if $(findstring $(CFG_ADB_DEVICE_STATUS),"true"), \ + $(eval $(call INSTALL_RUNTIME_TARGET_N,$(taget),$(CFG_BUILD))) \ + $(eval $(call INSTALL_RUNTIME_TARGET_CLEANUP_N,$(target))) \ + )) install-runtime-target: \ install-runtime-target-arm-linux-androideabi-cleanup \ diff --git a/mk/rt.mk b/mk/rt.mk index a8bbeb41517..527485c5029 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -139,9 +139,7 @@ ifeq ($$(CFG_WINDOWSY_$(1)), 1) JEMALLOC_ARGS_$(1) := --enable-lazy-lock else ifeq ($(OSTYPE_$(1)), apple-ios) JEMALLOC_ARGS_$(1) := --disable-tls -else ifeq ($(OSTYPE_$(1)), linux-androideabi) - JEMALLOC_ARGS_$(1) := --disable-tls -else ifeq ($(OSTYPE_$(1)), linux-android) +else ifeq ($(findstring android, $(OSTYPE_$(1))), android) JEMALLOC_ARGS_$(1) := --disable-tls endif diff --git a/mk/tests.mk b/mk/tests.mk index c5bb6ef81f6..d8597724370 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -107,14 +107,13 @@ endef $(foreach target,$(CFG_TARGET), \ $(eval $(call DEF_TARGET_COMMANDS,$(target)))) -# Target platform specific variables -# for arm-linux-androidabi +# Target platform specific variables for android define DEF_ADB_DEVICE_STATUS CFG_ADB_DEVICE_STATUS=$(1) endef $(foreach target,$(CFG_TARGET), \ - $(if $(findstring $(target),"arm-linux-androideabi"), \ + $(if $(findstring android, $(target)), \ $(if $(findstring adb,$(CFG_ADB)), \ $(if $(findstring device,$(shell $(CFG_ADB) devices 2>/dev/null | grep -E '^[:_A-Za-z0-9-]+[[:blank:]]+device')), \ $(info check: android device attached) \ @@ -135,12 +134,14 @@ $(info check: android device test dir $(CFG_ADB_TEST_DIR) ready \ $(shell $(CFG_ADB) remount 1>/dev/null) \ $(shell $(CFG_ADB) shell rm -r $(CFG_ADB_TEST_DIR) >/dev/null) \ $(shell $(CFG_ADB) shell mkdir $(CFG_ADB_TEST_DIR)) \ - $(shell $(CFG_ADB) shell mkdir $(CFG_ADB_TEST_DIR)/tmp) \ $(shell $(CFG_ADB) push $(S)src/etc/adb_run_wrapper.sh $(CFG_ADB_TEST_DIR) 1>/dev/null) \ - $(foreach crate,$(TARGET_CRATES), \ - $(shell $(CFG_ADB) push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(call CFG_LIB_GLOB_arm-linux-androideabi,$(crate)) \ - $(CFG_ADB_TEST_DIR))) \ - ) + $(foreach target,$(CFG_TARGET), \ + $(if $(findstring android, $(target)), \ + $(shell $(CFG_ADB) shell mkdir $(CFG_ADB_TEST_DIR)/$(target)) \ + $(foreach crate,$(TARGET_CRATES), \ + $(shell $(CFG_ADB) push $(TLIB2_T_$(target)_H_$(CFG_BUILD))/$(call CFG_LIB_GLOB_$(target),$(crate)) \ + $(CFG_ADB_TEST_DIR)/$(target))), \ + ))) else CFG_ADB_TEST_DIR= endif @@ -393,14 +394,14 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \ && touch $$@ endef -define DEF_TEST_CRATE_RULES_arm-linux-androideabi +define DEF_TEST_CRATE_RULES_android check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)) $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \ $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)) @$$(call E, run: $$< via adb) $$(Q)$(CFG_ADB) push $$< $(CFG_ADB_TEST_DIR) - $$(Q)$(CFG_ADB) shell '(cd $(CFG_ADB_TEST_DIR); LD_LIBRARY_PATH=. \ + $$(Q)$(CFG_ADB) shell '(cd $(CFG_ADB_TEST_DIR); LD_LIBRARY_PATH=./$(2) \ ./$$(notdir $$<) \ --logfile $(CFG_ADB_TEST_DIR)/check-stage$(1)-T-$(2)-H-$(3)-$(4).log \ $$(call CRATE_TEST_EXTRA_ARGS,$(1),$(2),$(3),$(4)) $(TESTARGS))' \ @@ -434,9 +435,9 @@ $(foreach host,$(CFG_HOST), \ $(foreach crate, $(TEST_CRATES), \ $(if $(findstring $(target),$(CFG_BUILD)), \ $(eval $(call DEF_TEST_CRATE_RULES,$(stage),$(target),$(host),$(crate))), \ - $(if $(findstring $(target),"arm-linux-androideabi"), \ + $(if $(findstring android, $(target)), \ $(if $(findstring $(CFG_ADB_DEVICE_STATUS),"true"), \ - $(eval $(call DEF_TEST_CRATE_RULES_arm-linux-androideabi,$(stage),$(target),$(host),$(crate))), \ + $(eval $(call DEF_TEST_CRATE_RULES_android,$(stage),$(target),$(host),$(crate))), \ $(eval $(call DEF_TEST_CRATE_RULES_null,$(stage),$(target),$(host),$(crate))) \ ), \ $(eval $(call DEF_TEST_CRATE_RULES,$(stage),$(target),$(host),$(crate))) \ diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index 6b6251a96c9..6c1308a01c4 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -153,12 +153,12 @@ pub fn parse_config(args: Vec<String> ) -> Config { lldb_version: extract_lldb_version(matches.opt_str("lldb-version")), android_cross_path: opt_path(matches, "android-cross-path"), adb_path: opt_str2(matches.opt_str("adb-path")), - adb_test_dir: opt_str2(matches.opt_str("adb-test-dir")), + adb_test_dir: format!("{}/{}", + opt_str2(matches.opt_str("adb-test-dir")), + opt_str2(matches.opt_str("target"))), adb_device_status: - "arm-linux-androideabi" == - opt_str2(matches.opt_str("target")) && - "(none)" != - opt_str2(matches.opt_str("adb-test-dir")) && + opt_str2(matches.opt_str("target")).contains("android") && + "(none)" != opt_str2(matches.opt_str("adb-test-dir")) && !opt_str2(matches.opt_str("adb-test-dir")).is_empty(), lldb_python_dir: matches.opt_str("lldb-python-dir"), verbose: matches.opt_present("verbose"), @@ -213,17 +213,17 @@ pub fn opt_str2(maybestr: Option<String>) -> String { } pub fn run_tests(config: &Config) { - if config.target == "arm-linux-androideabi" { + if config.target.contains("android") { match config.mode { DebugInfoGdb => { - println!("arm-linux-androideabi debug-info \ - test uses tcp 5039 port. please reserve it"); + println!("{} debug-info test uses tcp 5039 port.\ + please reserve it", config.target); } _ =>{} } - //arm-linux-androideabi debug-info test uses remote debugger - //so, we test 1 task at once. + // android debug-info test uses remote debugger + // so, we test 1 task at once. // also trying to isolate problems with adb_run_wrapper.sh ilooping env::set_var("RUST_TEST_TASKS","1"); } diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index 5a372fd7cdc..54c011832d1 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -42,7 +42,7 @@ use test::MetricMap; pub fn run(config: Config, testfile: String) { match &*config.target { - "arm-linux-androideabi" => { + "arm-linux-androideabi" | "aarch64-linux-android" => { if !config.adb_device_status { panic!("android device not available"); } @@ -382,17 +382,26 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) { let debugger_run_result; match &*config.target { - "arm-linux-androideabi" => { + "arm-linux-androideabi" | "aarch64-linux-android" => { - cmds = cmds.replace("run", "continue").to_string(); + cmds = cmds.replace("run", "continue"); // write debugger script - let script_str = ["set charset UTF-8".to_string(), - format!("file {}", exe_file.as_str().unwrap() - .to_string()), - "target remote :5039".to_string(), - cmds, - "quit".to_string()].connect("\n"); + let mut script_str = String::with_capacity(2048); + script_str.push_str("set charset UTF-8\n"); + script_str.push_str(&format!("file {}\n", exe_file.as_str().unwrap())); + script_str.push_str("target remote :5039\n"); + script_str.push_str(&format!("set solib-search-path \ + ./{}/stage2/lib/rustlib/{}/lib/\n", + config.host, config.target)); + for line in breakpoint_lines.iter() { + script_str.push_str(&format!("break {:?}:{}\n", + testfile.filename_display(), + *line)[]); + } + script_str.push_str(&cmds); + script_str.push_str("quit\n"); + debug!("script_str = {}", script_str); dump_output_file(config, testfile, @@ -425,8 +434,10 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) { .expect(&format!("failed to exec `{:?}`", config.adb_path)); let adb_arg = format!("export LD_LIBRARY_PATH={}; \ - gdbserver :5039 {}/{}", + gdbserver{} :5039 {}/{}", config.adb_test_dir.clone(), + if config.target.contains("aarch64") + {"64"} else {""}, config.adb_test_dir.clone(), str::from_utf8( exe_file.filename() @@ -470,7 +481,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) { format!("-command={}", debugger_script.as_str().unwrap())); let mut gdb_path = tool_path; - gdb_path.push_str("/bin/arm-linux-androideabi-gdb"); + gdb_path.push_str(&format!("/bin/{}-gdb", config.target)); let procsrv::Result { out, err, @@ -484,7 +495,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) { .expect(&format!("failed to exec `{:?}`", gdb_path)); let cmdline = { let cmdline = make_cmdline("", - "arm-linux-androideabi-gdb", + &format!("{}-gdb", config.target), &debugger_opts); logv(config, format!("executing {}", cmdline)); cmdline @@ -496,7 +507,9 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) { stderr: err, cmdline: cmdline }; - process.signal_kill().unwrap(); + if process.signal_kill().is_err() { + println!("Adb process is already finished."); + } } _=> { @@ -1135,7 +1148,7 @@ fn exec_compiled_test(config: &Config, props: &TestProps, match &*config.target { - "arm-linux-androideabi" => { + "arm-linux-androideabi" | "aarch64-linux-android" => { _arm_exec_compiled_test(config, props, testfile, env) } @@ -1200,7 +1213,7 @@ fn compose_and_run_compiler( } match &*config.target { - "arm-linux-androideabi" => { + "arm-linux-androideabi" | "aarch64-linux-android" => { _arm_push_aux_shared_library(config, testfile); } _ => {} @@ -1499,7 +1512,7 @@ fn _arm_exec_compiled_test(config: &Config, for (key, val) in env { runargs.push(format!("{}={}", key, val)); } - runargs.push(format!("{}/adb_run_wrapper.sh", config.adb_test_dir)); + runargs.push(format!("{}/../adb_run_wrapper.sh", config.adb_test_dir)); runargs.push(format!("{}", config.adb_test_dir)); runargs.push(format!("{}", prog_short)); @@ -1595,7 +1608,7 @@ fn _arm_push_aux_shared_library(config: &Config, testfile: &Path) { file.as_str() .unwrap() .to_string(), - config.adb_test_dir.to_string() + config.adb_test_dir.to_string(), ], vec!(("".to_string(), "".to_string())), diff --git a/src/etc/adb_run_wrapper.sh b/src/etc/adb_run_wrapper.sh index 6b5220597e9..bd6c483156f 100755 --- a/src/etc/adb_run_wrapper.sh +++ b/src/etc/adb_run_wrapper.sh @@ -24,8 +24,9 @@ then then shift + # The length of binary path (i.e. ./$RUN) should be shorter than 128 characters. cd $TEST_PATH - TEST_EXEC_ENV=22 LD_LIBRARY_PATH=$TEST_PATH PATH=$BIN_PATH:$TEST_PATH $TEST_PATH/$RUN $@ 1>$TEST_PATH/$RUN.stdout 2>$TEST_PATH/$RUN.stderr + TEST_EXEC_ENV=22 LD_LIBRARY_PATH=$TEST_PATH PATH=$BIN_PATH:$TEST_PATH ./$RUN $@ 1>$TEST_PATH/$RUN.stdout 2>$TEST_PATH/$RUN.stderr L_RET=$? echo $L_RET > $TEST_PATH/$RUN.exitcode diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index 4535e0b1691..e42b6c9c356 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -5473,6 +5473,7 @@ pub mod funcs { use types::os::arch::c95::{c_uchar, c_int, size_t}; extern { + #[cfg(not(all(target_os = "android", target_arch = "aarch64")))] pub fn getdtablesize() -> c_int; pub fn ioctl(d: c_int, request: c_int, ...) -> c_int; pub fn madvise(addr: *mut c_void, len: size_t, advice: c_int) diff --git a/src/librustc_back/target/aarch64_linux_android.rs b/src/librustc_back/target/aarch64_linux_android.rs index 313c0dc2a6e..64b0e0cfd6b 100644 --- a/src/librustc_back/target/aarch64_linux_android.rs +++ b/src/librustc_back/target/aarch64_linux_android.rs @@ -13,6 +13,7 @@ use target::Target; pub fn target() -> Target { let mut base = super::linux_base::opts(); base.pre_link_args.push("-Wl,--allow-multiple-definition".to_string()); + base.is_like_android = true; base.position_independent_executables = true; Target { data_layout: "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\ diff --git a/src/librustc_back/target/arm_linux_androideabi.rs b/src/librustc_back/target/arm_linux_androideabi.rs index 6fc77a715a5..fad93441431 100644 --- a/src/librustc_back/target/arm_linux_androideabi.rs +++ b/src/librustc_back/target/arm_linux_androideabi.rs @@ -16,6 +16,7 @@ pub fn target() -> Target { // Many of the symbols defined in compiler-rt are also defined in libgcc. Android // linker doesn't like that by default. base.pre_link_args.push("-Wl,--allow-multiple-definition".to_string()); + base.is_like_android = true; // FIXME #17437 (and #17448): Android doesn't support position dependent executables anymore. base.position_independent_executables = false; diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs index b80a486b191..2a4f5b00e93 100644 --- a/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs @@ -158,6 +158,9 @@ pub struct TargetOptions { /// only realy used for figuring out how to find libraries, since Windows uses its own /// library naming convention. Defaults to false. pub is_like_windows: bool, + /// Whether the target toolchain is like Android's. Only useful for compiling against Android. + /// Defaults to false. + pub is_like_android: bool, /// Whether the linker support GNU-like arguments such as -O. Defaults to false. pub linker_is_gnu: bool, /// Whether the linker support rpaths or not. Defaults to false. @@ -197,6 +200,7 @@ impl Default for TargetOptions { staticlib_suffix: ".a".to_string(), is_like_osx: false, is_like_windows: false, + is_like_android: false, linker_is_gnu: false, has_rpath: false, no_compiler_rt: false, @@ -345,11 +349,13 @@ impl Target { mips_unknown_linux_gnu, mipsel_unknown_linux_gnu, powerpc_unknown_linux_gnu, - arm_linux_androideabi, arm_unknown_linux_gnueabi, arm_unknown_linux_gnueabihf, aarch64_unknown_linux_gnu, + arm_linux_androideabi, + aarch64_linux_android, + x86_64_unknown_freebsd, i686_unknown_dragonfly, @@ -363,7 +369,6 @@ impl Target { i386_apple_ios, x86_64_apple_ios, aarch64_apple_ios, - aarch64_linux_android, armv7_apple_ios, armv7s_apple_ios, diff --git a/src/librustc_trans/trans/debuginfo.rs b/src/librustc_trans/trans/debuginfo.rs index c10ff753936..23498089c58 100644 --- a/src/librustc_trans/trans/debuginfo.rs +++ b/src/librustc_trans/trans/debuginfo.rs @@ -736,7 +736,9 @@ pub fn finalize(cx: &CrateContext) { // instruct LLVM to emit an older version of dwarf, however, // for OS X to understand. For more info see #11352 // This can be overridden using --llvm-opts -dwarf-version,N. - if cx.sess().target.target.options.is_like_osx { + // Android has the same issue (#22398) + if cx.sess().target.target.options.is_like_osx || + cx.sess().target.target.options.is_like_android { llvm::LLVMRustAddModuleFlag(cx.llmod(), "Dwarf Version\0".as_ptr() as *const _, 2) diff --git a/src/libstd/sys/unix/process.rs b/src/libstd/sys/unix/process.rs index 32e45009887..f954024b0e9 100644 --- a/src/libstd/sys/unix/process.rs +++ b/src/libstd/sys/unix/process.rs @@ -70,7 +70,6 @@ impl Process { K: BytesContainer + Eq + Hash<Hasher>, V: BytesContainer { use libc::funcs::posix88::unistd::{fork, dup2, close, chdir, execvp}; - use libc::funcs::bsd44::getdtablesize; mod rustrt { extern { @@ -78,6 +77,15 @@ impl Process { } } + #[cfg(all(target_os = "android", target_arch = "aarch64"))] + unsafe fn getdtablesize() -> c_int { + libc::sysconf(libc::consts::os::sysconf::_SC_OPEN_MAX) as c_int + } + #[cfg(not(all(target_os = "android", target_arch = "aarch64")))] + unsafe fn getdtablesize() -> c_int { + libc::funcs::bsd44::getdtablesize() + } + unsafe fn set_cloexec(fd: c_int) { let ret = c::ioctl(fd, c::FIOCLEX); assert_eq!(ret, 0); diff --git a/src/test/compile-fail-fulldeps/macro-crate-cannot-read-embedded-ident.rs b/src/test/compile-fail-fulldeps/macro-crate-cannot-read-embedded-ident.rs index c9ca6e5326c..fd1deffb59d 100644 --- a/src/test/compile-fail-fulldeps/macro-crate-cannot-read-embedded-ident.rs +++ b/src/test/compile-fail-fulldeps/macro-crate-cannot-read-embedded-ident.rs @@ -10,7 +10,6 @@ // aux-build:macro_crate_test.rs // ignore-stage1 -// ignore-android // error-pattern: unknown start of token: \u{0} // Issue #15750 and #15962 : this test is checking that the standard diff --git a/src/test/compile-fail-fulldeps/macro-crate-doesnt-resolve.rs b/src/test/compile-fail-fulldeps/macro-crate-doesnt-resolve.rs index adcdba04cc7..361840a1618 100644 --- a/src/test/compile-fail-fulldeps/macro-crate-doesnt-resolve.rs +++ b/src/test/compile-fail-fulldeps/macro-crate-doesnt-resolve.rs @@ -10,7 +10,6 @@ // aux-build:macro_crate_test.rs // ignore-stage1 -// ignore-android #[macro_use] #[no_link] extern crate macro_crate_test; diff --git a/src/test/compile-fail-fulldeps/macro-crate-unexported-macro.rs b/src/test/compile-fail-fulldeps/macro-crate-unexported-macro.rs index b5ff8b71556..ba8e20069c1 100644 --- a/src/test/compile-fail-fulldeps/macro-crate-unexported-macro.rs +++ b/src/test/compile-fail-fulldeps/macro-crate-unexported-macro.rs @@ -10,7 +10,6 @@ // aux-build:macro_crate_test.rs // ignore-stage1 -// ignore-android #[macro_use] #[no_link] extern crate macro_crate_test; diff --git a/src/test/compile-fail-fulldeps/plugin-MacroRulesTT.rs b/src/test/compile-fail-fulldeps/plugin-MacroRulesTT.rs index 68b27822d3d..e13ddd13f5d 100644 --- a/src/test/compile-fail-fulldeps/plugin-MacroRulesTT.rs +++ b/src/test/compile-fail-fulldeps/plugin-MacroRulesTT.rs @@ -10,7 +10,6 @@ // aux-build:macro_crate_MacroRulesTT.rs // ignore-stage1 -// ignore-android // error-pattern: plugin tried to register a new MacroRulesTT #![feature(plugin)] diff --git a/src/test/debuginfo/associated-types.rs b/src/test/debuginfo/associated-types.rs index 0f6f0ac6ae7..26117e7a13b 100644 --- a/src/test/debuginfo/associated-types.rs +++ b/src/test/debuginfo/associated-types.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/basic-types-globals-metadata.rs b/src/test/debuginfo/basic-types-globals-metadata.rs index 91e78c820e6..30a70fe0b37 100644 --- a/src/test/debuginfo/basic-types-globals-metadata.rs +++ b/src/test/debuginfo/basic-types-globals-metadata.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/basic-types-globals.rs b/src/test/debuginfo/basic-types-globals.rs index d37b0f60d3d..cb89879481b 100644 --- a/src/test/debuginfo/basic-types-globals.rs +++ b/src/test/debuginfo/basic-types-globals.rs @@ -14,7 +14,6 @@ // about UTF-32 character encoding and will print a rust char as only // its numerical value. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/basic-types-metadata.rs b/src/test/debuginfo/basic-types-metadata.rs index 3b016f287fb..0134a058c99 100644 --- a/src/test/debuginfo/basic-types-metadata.rs +++ b/src/test/debuginfo/basic-types-metadata.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/basic-types-mut-globals.rs b/src/test/debuginfo/basic-types-mut-globals.rs index bc8cdaf8eac..7f82878e080 100644 --- a/src/test/debuginfo/basic-types-mut-globals.rs +++ b/src/test/debuginfo/basic-types-mut-globals.rs @@ -14,7 +14,6 @@ // about UTF-32 character encoding and will print a rust char as only // its numerical value. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/basic-types.rs b/src/test/debuginfo/basic-types.rs index f61f49228cd..95483c16783 100644 --- a/src/test/debuginfo/basic-types.rs +++ b/src/test/debuginfo/basic-types.rs @@ -14,7 +14,6 @@ // about UTF-32 character encoding and will print a rust char as only // its numerical value. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/borrowed-basic.rs b/src/test/debuginfo/borrowed-basic.rs index f4c31278cf6..52e81b7e046 100644 --- a/src/test/debuginfo/borrowed-basic.rs +++ b/src/test/debuginfo/borrowed-basic.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // Gdb doesn't know about UTF-32 character encoding and will print a rust char as only // its numerical value. diff --git a/src/test/debuginfo/borrowed-c-style-enum.rs b/src/test/debuginfo/borrowed-c-style-enum.rs index c2da58f1583..ecc70f4d77e 100644 --- a/src/test/debuginfo/borrowed-c-style-enum.rs +++ b/src/test/debuginfo/borrowed-c-style-enum.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // compile-flags:-g // min-lldb-version: 310 diff --git a/src/test/debuginfo/borrowed-enum.rs b/src/test/debuginfo/borrowed-enum.rs index d54869888f1..87e9e7fe2da 100644 --- a/src/test/debuginfo/borrowed-enum.rs +++ b/src/test/debuginfo/borrowed-enum.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-tidy-linelength -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/borrowed-struct.rs b/src/test/debuginfo/borrowed-struct.rs index 53d2befc49d..2cfc6855e5b 100644 --- a/src/test/debuginfo/borrowed-struct.rs +++ b/src/test/debuginfo/borrowed-struct.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // compile-flags:-g // min-lldb-version: 310 diff --git a/src/test/debuginfo/borrowed-tuple.rs b/src/test/debuginfo/borrowed-tuple.rs index c7e5987fbcf..768bcc9fc3f 100644 --- a/src/test/debuginfo/borrowed-tuple.rs +++ b/src/test/debuginfo/borrowed-tuple.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/borrowed-unique-basic.rs b/src/test/debuginfo/borrowed-unique-basic.rs index fc186a0b5b2..14a3d008f42 100644 --- a/src/test/debuginfo/borrowed-unique-basic.rs +++ b/src/test/debuginfo/borrowed-unique-basic.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // Gdb doesn't know about UTF-32 character encoding and will print a rust char as only diff --git a/src/test/debuginfo/box.rs b/src/test/debuginfo/box.rs index 6db3dce4668..0689a6bc45b 100644 --- a/src/test/debuginfo/box.rs +++ b/src/test/debuginfo/box.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/boxed-struct.rs b/src/test/debuginfo/boxed-struct.rs index 6397efa0a96..972d6ab12e1 100644 --- a/src/test/debuginfo/boxed-struct.rs +++ b/src/test/debuginfo/boxed-struct.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/by-value-non-immediate-argument.rs b/src/test/debuginfo/by-value-non-immediate-argument.rs index 8ac8d5970f3..3efda1e2f6a 100644 --- a/src/test/debuginfo/by-value-non-immediate-argument.rs +++ b/src/test/debuginfo/by-value-non-immediate-argument.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-tidy-linelength -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/by-value-self-argument-in-trait-impl.rs b/src/test/debuginfo/by-value-self-argument-in-trait-impl.rs index 6907313370e..2b2a9bf83f1 100644 --- a/src/test/debuginfo/by-value-self-argument-in-trait-impl.rs +++ b/src/test/debuginfo/by-value-self-argument-in-trait-impl.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/c-style-enum-in-composite.rs b/src/test/debuginfo/c-style-enum-in-composite.rs index f2dfc63d522..c7a4daa42fa 100644 --- a/src/test/debuginfo/c-style-enum-in-composite.rs +++ b/src/test/debuginfo/c-style-enum-in-composite.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-tidy-linelength -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/c-style-enum.rs b/src/test/debuginfo/c-style-enum.rs index ad7c860c8b9..2305d7bc5c2 100644 --- a/src/test/debuginfo/c-style-enum.rs +++ b/src/test/debuginfo/c-style-enum.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/closure-in-generic-function.rs b/src/test/debuginfo/closure-in-generic-function.rs index ea684b1d69c..b92f5de21b5 100644 --- a/src/test/debuginfo/closure-in-generic-function.rs +++ b/src/test/debuginfo/closure-in-generic-function.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/cross-crate-type-uniquing.rs b/src/test/debuginfo/cross-crate-type-uniquing.rs index 5a56722f0cc..47365b2b9a0 100644 --- a/src/test/debuginfo/cross-crate-type-uniquing.rs +++ b/src/test/debuginfo/cross-crate-type-uniquing.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // aux-build:cross_crate_debuginfo_type_uniquing.rs diff --git a/src/test/debuginfo/destructured-fn-argument.rs b/src/test/debuginfo/destructured-fn-argument.rs index 77b29389338..51cced20439 100644 --- a/src/test/debuginfo/destructured-fn-argument.rs +++ b/src/test/debuginfo/destructured-fn-argument.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/destructured-for-loop-variable.rs b/src/test/debuginfo/destructured-for-loop-variable.rs index 37e465e43c3..9f0492f35a3 100644 --- a/src/test/debuginfo/destructured-for-loop-variable.rs +++ b/src/test/debuginfo/destructured-for-loop-variable.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/destructured-local.rs b/src/test/debuginfo/destructured-local.rs index eaa2382501b..cf0ca0b67a7 100644 --- a/src/test/debuginfo/destructured-local.rs +++ b/src/test/debuginfo/destructured-local.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/evec-in-struct.rs b/src/test/debuginfo/evec-in-struct.rs index f623a321922..1a9b9f73cba 100644 --- a/src/test/debuginfo/evec-in-struct.rs +++ b/src/test/debuginfo/evec-in-struct.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/function-arg-initialization.rs b/src/test/debuginfo/function-arg-initialization.rs index f9a2b2fef34..9eadf3cc19b 100644 --- a/src/test/debuginfo/function-arg-initialization.rs +++ b/src/test/debuginfo/function-arg-initialization.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // This test case checks if function arguments already have the correct value when breaking at the diff --git a/src/test/debuginfo/function-arguments.rs b/src/test/debuginfo/function-arguments.rs index 01136c11014..2ab3668abb9 100644 --- a/src/test/debuginfo/function-arguments.rs +++ b/src/test/debuginfo/function-arguments.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/generic-function.rs b/src/test/debuginfo/generic-function.rs index b9a09867a00..76b7a3e729d 100644 --- a/src/test/debuginfo/generic-function.rs +++ b/src/test/debuginfo/generic-function.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/generic-functions-nested.rs b/src/test/debuginfo/generic-functions-nested.rs index 9f6d8a45a99..5f9236038b2 100644 --- a/src/test/debuginfo/generic-functions-nested.rs +++ b/src/test/debuginfo/generic-functions-nested.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/generic-method-on-generic-struct.rs b/src/test/debuginfo/generic-method-on-generic-struct.rs index d94baa637c2..8c4eeb27c0f 100644 --- a/src/test/debuginfo/generic-method-on-generic-struct.rs +++ b/src/test/debuginfo/generic-method-on-generic-struct.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // compile-flags:-g // min-lldb-version: 310 diff --git a/src/test/debuginfo/generic-static-method-on-struct-and-enum.rs b/src/test/debuginfo/generic-static-method-on-struct-and-enum.rs index 61843a20d05..eb1083f624f 100644 --- a/src/test/debuginfo/generic-static-method-on-struct-and-enum.rs +++ b/src/test/debuginfo/generic-static-method-on-struct-and-enum.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/generic-struct-style-enum.rs b/src/test/debuginfo/generic-struct-style-enum.rs index 2faafbd7634..455861b1ea1 100644 --- a/src/test/debuginfo/generic-struct-style-enum.rs +++ b/src/test/debuginfo/generic-struct-style-enum.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-tidy-linelength -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/generic-struct.rs b/src/test/debuginfo/generic-struct.rs index 696d2703bde..15982f309c6 100644 --- a/src/test/debuginfo/generic-struct.rs +++ b/src/test/debuginfo/generic-struct.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-tidy-linelength -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/generic-tuple-style-enum.rs b/src/test/debuginfo/generic-tuple-style-enum.rs index f9dc9d1f055..da62e335557 100644 --- a/src/test/debuginfo/generic-tuple-style-enum.rs +++ b/src/test/debuginfo/generic-tuple-style-enum.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-tidy-linelength -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/include_string.rs b/src/test/debuginfo/include_string.rs index 25719a80286..1dead6c2734 100644 --- a/src/test/debuginfo/include_string.rs +++ b/src/test/debuginfo/include_string.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/issue11600.rs b/src/test/debuginfo/issue11600.rs index 51664000299..e93704cac34 100644 --- a/src/test/debuginfo/issue11600.rs +++ b/src/test/debuginfo/issue11600.rs @@ -17,7 +17,6 @@ fn main() { ::std::io::println(args[0]); } -// ignore-android: FIXME(#10381) // ignore-lldb // This test case checks whether compile unit names are set correctly, so that the correct default diff --git a/src/test/debuginfo/issue12886.rs b/src/test/debuginfo/issue12886.rs index c6acc9a31fe..424ba50e3c9 100644 --- a/src/test/debuginfo/issue12886.rs +++ b/src/test/debuginfo/issue12886.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // ignore-windows failing on 64-bit bots FIXME #17638 // ignore-lldb @@ -16,7 +15,7 @@ // gdb-command:run // gdb-command:next -// gdb-check:[...]34[...]s +// gdb-check:[...]33[...]s // gdb-command:continue #![omit_gdb_pretty_printer_section] diff --git a/src/test/debuginfo/issue13213.rs b/src/test/debuginfo/issue13213.rs index dd61542b800..a079ddbd0f5 100644 --- a/src/test/debuginfo/issue13213.rs +++ b/src/test/debuginfo/issue13213.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // aux-build:issue13213aux.rs diff --git a/src/test/debuginfo/issue14411.rs b/src/test/debuginfo/issue14411.rs index 0fc567f421f..3b2d372117d 100644 --- a/src/test/debuginfo/issue14411.rs +++ b/src/test/debuginfo/issue14411.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scope-in-for-loop.rs b/src/test/debuginfo/lexical-scope-in-for-loop.rs index fe5983cbb6a..dceb436310f 100644 --- a/src/test/debuginfo/lexical-scope-in-for-loop.rs +++ b/src/test/debuginfo/lexical-scope-in-for-loop.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scope-in-if.rs b/src/test/debuginfo/lexical-scope-in-if.rs index c885bfce216..08a762fc4e5 100644 --- a/src/test/debuginfo/lexical-scope-in-if.rs +++ b/src/test/debuginfo/lexical-scope-in-if.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scope-in-match.rs b/src/test/debuginfo/lexical-scope-in-match.rs index c596253560e..c2cddd25768 100644 --- a/src/test/debuginfo/lexical-scope-in-match.rs +++ b/src/test/debuginfo/lexical-scope-in-match.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scope-in-parameterless-closure.rs b/src/test/debuginfo/lexical-scope-in-parameterless-closure.rs index fb4378d5e8b..374df2f094a 100644 --- a/src/test/debuginfo/lexical-scope-in-parameterless-closure.rs +++ b/src/test/debuginfo/lexical-scope-in-parameterless-closure.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-C debuginfo=1 diff --git a/src/test/debuginfo/lexical-scope-in-stack-closure.rs b/src/test/debuginfo/lexical-scope-in-stack-closure.rs index 6cb1218c123..6a909ced818 100644 --- a/src/test/debuginfo/lexical-scope-in-stack-closure.rs +++ b/src/test/debuginfo/lexical-scope-in-stack-closure.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scope-in-unconditional-loop.rs b/src/test/debuginfo/lexical-scope-in-unconditional-loop.rs index 6826bca695b..868cea29a7b 100644 --- a/src/test/debuginfo/lexical-scope-in-unconditional-loop.rs +++ b/src/test/debuginfo/lexical-scope-in-unconditional-loop.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scope-in-unique-closure.rs b/src/test/debuginfo/lexical-scope-in-unique-closure.rs index ba660deeca0..c0a5a31c9ce 100644 --- a/src/test/debuginfo/lexical-scope-in-unique-closure.rs +++ b/src/test/debuginfo/lexical-scope-in-unique-closure.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scope-in-while.rs b/src/test/debuginfo/lexical-scope-in-while.rs index 40280b469f7..b5f43e7d21f 100644 --- a/src/test/debuginfo/lexical-scope-in-while.rs +++ b/src/test/debuginfo/lexical-scope-in-while.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scope-with-macro.rs b/src/test/debuginfo/lexical-scope-with-macro.rs index da941979fb6..1dd738c6d51 100644 --- a/src/test/debuginfo/lexical-scope-with-macro.rs +++ b/src/test/debuginfo/lexical-scope-with-macro.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scopes-in-block-expression.rs b/src/test/debuginfo/lexical-scopes-in-block-expression.rs index 118d096d31b..c1ec837a4b8 100644 --- a/src/test/debuginfo/lexical-scopes-in-block-expression.rs +++ b/src/test/debuginfo/lexical-scopes-in-block-expression.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/limited-debuginfo.rs b/src/test/debuginfo/limited-debuginfo.rs index c8fe76fdbe5..e51842992cc 100644 --- a/src/test/debuginfo/limited-debuginfo.rs +++ b/src/test/debuginfo/limited-debuginfo.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // ignore-lldb diff --git a/src/test/debuginfo/method-on-enum.rs b/src/test/debuginfo/method-on-enum.rs index f8912636971..7ad668791d3 100644 --- a/src/test/debuginfo/method-on-enum.rs +++ b/src/test/debuginfo/method-on-enum.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-tidy-linelength -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/method-on-generic-struct.rs b/src/test/debuginfo/method-on-generic-struct.rs index fa93eaba279..6b56a7998c9 100644 --- a/src/test/debuginfo/method-on-generic-struct.rs +++ b/src/test/debuginfo/method-on-generic-struct.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/method-on-struct.rs b/src/test/debuginfo/method-on-struct.rs index 56f79da709e..e32288a8e7d 100644 --- a/src/test/debuginfo/method-on-struct.rs +++ b/src/test/debuginfo/method-on-struct.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/method-on-trait.rs b/src/test/debuginfo/method-on-trait.rs index 4fff301eb5f..6e9a695720a 100644 --- a/src/test/debuginfo/method-on-trait.rs +++ b/src/test/debuginfo/method-on-trait.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/method-on-tuple-struct.rs b/src/test/debuginfo/method-on-tuple-struct.rs index 7c4ce211f2f..cee04e92c2d 100644 --- a/src/test/debuginfo/method-on-tuple-struct.rs +++ b/src/test/debuginfo/method-on-tuple-struct.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/multi-byte-chars.rs b/src/test/debuginfo/multi-byte-chars.rs index dd0d86bf742..f02e3f2a22b 100644 --- a/src/test/debuginfo/multi-byte-chars.rs +++ b/src/test/debuginfo/multi-byte-chars.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/multiple-functions-equal-var-names.rs b/src/test/debuginfo/multiple-functions-equal-var-names.rs index 0b2f8ef8181..5fe0c13e5e4 100644 --- a/src/test/debuginfo/multiple-functions-equal-var-names.rs +++ b/src/test/debuginfo/multiple-functions-equal-var-names.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/multiple-functions.rs b/src/test/debuginfo/multiple-functions.rs index 00698ae1dfb..3179a8050d3 100644 --- a/src/test/debuginfo/multiple-functions.rs +++ b/src/test/debuginfo/multiple-functions.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/name-shadowing-and-scope-nesting.rs b/src/test/debuginfo/name-shadowing-and-scope-nesting.rs index 8c1a5376dba..5553d7e496b 100644 --- a/src/test/debuginfo/name-shadowing-and-scope-nesting.rs +++ b/src/test/debuginfo/name-shadowing-and-scope-nesting.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/nil-enum.rs b/src/test/debuginfo/nil-enum.rs index f0eaf6acb61..44d7c2b1ad2 100644 --- a/src/test/debuginfo/nil-enum.rs +++ b/src/test/debuginfo/nil-enum.rs @@ -11,7 +11,6 @@ // LLDB can't handle zero-sized values // ignore-lldb -// ignore-android: FIXME(#10381) // compile-flags:-g // gdb-command:run diff --git a/src/test/debuginfo/no-debug-attribute.rs b/src/test/debuginfo/no-debug-attribute.rs index dcc1928ae50..d2b21a648a0 100644 --- a/src/test/debuginfo/no-debug-attribute.rs +++ b/src/test/debuginfo/no-debug-attribute.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // ignore-lldb // compile-flags:-g diff --git a/src/test/debuginfo/option-like-enum.rs b/src/test/debuginfo/option-like-enum.rs index fdfbcda7421..0aef1374659 100644 --- a/src/test/debuginfo/option-like-enum.rs +++ b/src/test/debuginfo/option-like-enum.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-tidy-linelength -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/packed-struct-with-destructor.rs b/src/test/debuginfo/packed-struct-with-destructor.rs index 84c0b8da02c..8b2f34a9909 100644 --- a/src/test/debuginfo/packed-struct-with-destructor.rs +++ b/src/test/debuginfo/packed-struct-with-destructor.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-tidy-linelength -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/packed-struct.rs b/src/test/debuginfo/packed-struct.rs index 97e6ee79952..9f3b7baf83d 100644 --- a/src/test/debuginfo/packed-struct.rs +++ b/src/test/debuginfo/packed-struct.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-tidy-linelength -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/recursive-enum.rs b/src/test/debuginfo/recursive-enum.rs index 73a68893e93..ef1092efa11 100644 --- a/src/test/debuginfo/recursive-enum.rs +++ b/src/test/debuginfo/recursive-enum.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // ignore-lldb // compile-flags:-g diff --git a/src/test/debuginfo/recursive-struct.rs b/src/test/debuginfo/recursive-struct.rs index 2cbe9f43789..3b1979337d5 100644 --- a/src/test/debuginfo/recursive-struct.rs +++ b/src/test/debuginfo/recursive-struct.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-tidy-linelength -// ignore-android: FIXME(#10381) // ignore-lldb // compile-flags:-g diff --git a/src/test/debuginfo/self-in-default-method.rs b/src/test/debuginfo/self-in-default-method.rs index e494973b975..cb2b04f4d86 100644 --- a/src/test/debuginfo/self-in-default-method.rs +++ b/src/test/debuginfo/self-in-default-method.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/self-in-generic-default-method.rs b/src/test/debuginfo/self-in-generic-default-method.rs index 0fe74015611..b96ec3b7b88 100644 --- a/src/test/debuginfo/self-in-generic-default-method.rs +++ b/src/test/debuginfo/self-in-generic-default-method.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/shadowed-argument.rs b/src/test/debuginfo/shadowed-argument.rs index 5b36d32e49f..4d74e6f1084 100644 --- a/src/test/debuginfo/shadowed-argument.rs +++ b/src/test/debuginfo/shadowed-argument.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/shadowed-variable.rs b/src/test/debuginfo/shadowed-variable.rs index 66fd656eaac..630999677ab 100644 --- a/src/test/debuginfo/shadowed-variable.rs +++ b/src/test/debuginfo/shadowed-variable.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/simd.rs b/src/test/debuginfo/simd.rs index 578ea4479ec..161392c94c8 100644 --- a/src/test/debuginfo/simd.rs +++ b/src/test/debuginfo/simd.rs @@ -11,7 +11,6 @@ // Need a fix for LLDB first... // ignore-lldb -// ignore-android: FIXME(#10381) // compile-flags:-g // gdb-command:run diff --git a/src/test/debuginfo/simple-lexical-scope.rs b/src/test/debuginfo/simple-lexical-scope.rs index 31441db20f1..c1dae7a6d67 100644 --- a/src/test/debuginfo/simple-lexical-scope.rs +++ b/src/test/debuginfo/simple-lexical-scope.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/simple-struct.rs b/src/test/debuginfo/simple-struct.rs index 3015b16a0aa..eee3cf55052 100644 --- a/src/test/debuginfo/simple-struct.rs +++ b/src/test/debuginfo/simple-struct.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/simple-tuple.rs b/src/test/debuginfo/simple-tuple.rs index 78184fab7d3..75db47af246 100644 --- a/src/test/debuginfo/simple-tuple.rs +++ b/src/test/debuginfo/simple-tuple.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/static-method-on-struct-and-enum.rs b/src/test/debuginfo/static-method-on-struct-and-enum.rs index 59ee300b3e3..48db69289c0 100644 --- a/src/test/debuginfo/static-method-on-struct-and-enum.rs +++ b/src/test/debuginfo/static-method-on-struct-and-enum.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/struct-in-enum.rs b/src/test/debuginfo/struct-in-enum.rs index 6f801a7d587..b2971329cc8 100644 --- a/src/test/debuginfo/struct-in-enum.rs +++ b/src/test/debuginfo/struct-in-enum.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-tidy-linelength -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/struct-in-struct.rs b/src/test/debuginfo/struct-in-struct.rs index 3f819c92e10..8bccb041c9a 100644 --- a/src/test/debuginfo/struct-in-struct.rs +++ b/src/test/debuginfo/struct-in-struct.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-tidy-linelength -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/struct-style-enum.rs b/src/test/debuginfo/struct-style-enum.rs index f6d4627082f..d522e9f8910 100644 --- a/src/test/debuginfo/struct-style-enum.rs +++ b/src/test/debuginfo/struct-style-enum.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-tidy-linelength -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/struct-with-destructor.rs b/src/test/debuginfo/struct-with-destructor.rs index 743f5ac5ff4..4c2c9d06ae9 100644 --- a/src/test/debuginfo/struct-with-destructor.rs +++ b/src/test/debuginfo/struct-with-destructor.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/trait-pointers.rs b/src/test/debuginfo/trait-pointers.rs index b95190f875a..f74c9953f7d 100644 --- a/src/test/debuginfo/trait-pointers.rs +++ b/src/test/debuginfo/trait-pointers.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/tuple-in-struct.rs b/src/test/debuginfo/tuple-in-struct.rs index 3d28490c0cf..7da1ef2e118 100644 --- a/src/test/debuginfo/tuple-in-struct.rs +++ b/src/test/debuginfo/tuple-in-struct.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/tuple-in-tuple.rs b/src/test/debuginfo/tuple-in-tuple.rs index b1228f7a884..9b4c759ab02 100644 --- a/src/test/debuginfo/tuple-in-tuple.rs +++ b/src/test/debuginfo/tuple-in-tuple.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/tuple-struct.rs b/src/test/debuginfo/tuple-struct.rs index 0960ab5834d..e679dac9546 100644 --- a/src/test/debuginfo/tuple-struct.rs +++ b/src/test/debuginfo/tuple-struct.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/tuple-style-enum.rs b/src/test/debuginfo/tuple-style-enum.rs index f205f484f25..7c9760c3a53 100644 --- a/src/test/debuginfo/tuple-style-enum.rs +++ b/src/test/debuginfo/tuple-style-enum.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-tidy-linelength -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/unique-enum.rs b/src/test/debuginfo/unique-enum.rs index 08622b2dca8..69b5797007b 100644 --- a/src/test/debuginfo/unique-enum.rs +++ b/src/test/debuginfo/unique-enum.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-tidy-linelength -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/unreachable-locals.rs b/src/test/debuginfo/unreachable-locals.rs index 8bcb54af8ba..309848d6ced 100644 --- a/src/test/debuginfo/unreachable-locals.rs +++ b/src/test/debuginfo/unreachable-locals.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/var-captured-in-nested-closure.rs b/src/test/debuginfo/var-captured-in-nested-closure.rs index 512df3605bf..9c9d82249ee 100644 --- a/src/test/debuginfo/var-captured-in-nested-closure.rs +++ b/src/test/debuginfo/var-captured-in-nested-closure.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/var-captured-in-sendable-closure.rs b/src/test/debuginfo/var-captured-in-sendable-closure.rs index b07c8ffde7f..6b96556dc2f 100644 --- a/src/test/debuginfo/var-captured-in-sendable-closure.rs +++ b/src/test/debuginfo/var-captured-in-sendable-closure.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/var-captured-in-stack-closure.rs b/src/test/debuginfo/var-captured-in-stack-closure.rs index ee706c13634..e3bd1eade75 100644 --- a/src/test/debuginfo/var-captured-in-stack-closure.rs +++ b/src/test/debuginfo/var-captured-in-stack-closure.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/debuginfo/vec.rs b/src/test/debuginfo/vec.rs index 9ee18c0d77b..f7bdf1bd3fa 100644 --- a/src/test/debuginfo/vec.rs +++ b/src/test/debuginfo/vec.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android: FIXME(#10381) // min-lldb-version: 310 // compile-flags:-g diff --git a/src/test/run-pass-fulldeps/issue_16723_multiple_items_syntax_ext.rs b/src/test/run-pass-fulldeps/issue_16723_multiple_items_syntax_ext.rs index c59a3589c04..c1ffeb7c8e2 100644 --- a/src/test/run-pass-fulldeps/issue_16723_multiple_items_syntax_ext.rs +++ b/src/test/run-pass-fulldeps/issue_16723_multiple_items_syntax_ext.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-stage1 -// ignore-android // aux-build:issue_16723_multiple_items_syntax_ext.rs #![feature(plugin)] #![plugin(issue_16723_multiple_items_syntax_ext)] diff --git a/src/test/run-pass/capturing-logging.rs b/src/test/run-pass/capturing-logging.rs index 308b225a344..70cc0463a6e 100644 --- a/src/test/run-pass/capturing-logging.rs +++ b/src/test/run-pass/capturing-logging.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android (FIXME #11419) // exec-env:RUST_LOG=info #![allow(unknown_features)] diff --git a/src/test/run-pass/intrinsic-alignment.rs b/src/test/run-pass/intrinsic-alignment.rs index 07f021e48d7..bd2f73440ca 100644 --- a/src/test/run-pass/intrinsic-alignment.rs +++ b/src/test/run-pass/intrinsic-alignment.rs @@ -66,7 +66,7 @@ mod m { #[cfg(target_os = "android")] mod m { #[main] - #[cfg(target_arch = "arm")] + #[cfg(any(target_arch = "arm", target_arch = "aarch64"))] pub fn main() { unsafe { assert_eq!(::rusti::pref_align_of::<u64>(), 8u); diff --git a/src/test/run-pass/issue-16671.rs b/src/test/run-pass/issue-16671.rs index 124b0205fae..707aa48259a 100644 --- a/src/test/run-pass/issue-16671.rs +++ b/src/test/run-pass/issue-16671.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android seems to block forever #![forbid(warnings)] diff --git a/src/test/run-pass/linkage1.rs b/src/test/run-pass/linkage1.rs index 0ba7dcb013b..5cd741350d5 100644 --- a/src/test/run-pass/linkage1.rs +++ b/src/test/run-pass/linkage1.rs @@ -9,7 +9,6 @@ // except according to those terms. // ignore-windows -// ignore-android // ignore-macos // aux-build:linkage1.rs diff --git a/src/test/run-pass/logging-separate-lines.rs b/src/test/run-pass/logging-separate-lines.rs index 1be0ee4a285..e1141d4ab37 100644 --- a/src/test/run-pass/logging-separate-lines.rs +++ b/src/test/run-pass/logging-separate-lines.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android // ignore-windows // exec-env:RUST_LOG=debug diff --git a/src/test/run-pass/rec-align-u64.rs b/src/test/run-pass/rec-align-u64.rs index 5330490e54f..0be6e22f609 100644 --- a/src/test/run-pass/rec-align-u64.rs +++ b/src/test/run-pass/rec-align-u64.rs @@ -72,7 +72,7 @@ mod m { #[cfg(target_os = "android")] mod m { - #[cfg(target_arch = "arm")] + #[cfg(any(target_arch = "arm", target_arch = "aarch64"))] pub mod m { pub fn align() -> uint { 8u } pub fn size() -> uint { 16u } diff --git a/src/test/run-pass/sepcomp-lib-lto.rs b/src/test/run-pass/sepcomp-lib-lto.rs index 002671ff517..f0b6a505929 100644 --- a/src/test/run-pass/sepcomp-lib-lto.rs +++ b/src/test/run-pass/sepcomp-lib-lto.rs @@ -11,7 +11,6 @@ // Check that we can use `-C lto` when linking against libraries that were // separately compiled. -// ignore-android linker weridness (see #18800) // aux-build:sepcomp_lib.rs // compile-flags: -C lto // no-prefer-dynamic diff --git a/src/test/run-pass/smallest-hello-world.rs b/src/test/run-pass/smallest-hello-world.rs index 197890c1277..61b2fc8b50f 100644 --- a/src/test/run-pass/smallest-hello-world.rs +++ b/src/test/run-pass/smallest-hello-world.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android - // Smallest "hello world" with a libc runtime #![feature(intrinsics, lang_items, start, no_std)] @@ -34,3 +32,6 @@ fn main(_: int, _: *const *const u8) -> int { return 0; } +#[cfg(target_os = "android")] +#[link(name="gcc")] +extern { } |