Skip to content

Commit 60d9c85

Browse files
committed
---
yaml --- r: 194522 b: refs/heads/snap-stage3 c: d4ba1ca h: refs/heads/master v: v3
1 parent dceaeb7 commit 60d9c85

File tree

7 files changed

+15
-5
lines changed

7 files changed

+15
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 242ed0b7c0f6a21096f2cc3e1ad1bdb176d02545
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 02c6f6b04928480d302f25520a5c06d55e91eaf8
4+
refs/heads/snap-stage3: d4ba1caa99e63b14f6b4d0789344c7ad11100744
55
refs/heads/try: 961e0358e1a5c0faaef606e31e9965742c1643bf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/mk/tests.mk

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,11 @@ ifeq ($(CFG_OSTYPE),apple-darwin)
569569
CTEST_DISABLE_debuginfo-gdb = "gdb on darwin needs root"
570570
endif
571571

572+
ifeq ($(findstring android, $(CFG_TARGET)), android)
573+
CTEST_DISABLE_debuginfo-gdb =
574+
CTEST_DISABLE_debuginfo-lldb = "lldb tests are disabled on android"
575+
endif
576+
572577
# CTEST_DISABLE_NONSELFHOST_$(TEST_GROUP), if set, will cause that
573578
# test group to be disabled *unless* the target is able to build a
574579
# compiler (i.e. when the target triple is in the set of of host

branches/snap-stage3/src/libcore/ops.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -995,8 +995,10 @@ impl fmt::Debug for RangeFull {
995995
#[stable(feature = "rust1", since = "1.0.0")]
996996
pub struct Range<Idx> {
997997
/// The lower bound of the range (inclusive).
998+
#[stable(feature = "rust1", since = "1.0.0")]
998999
pub start: Idx,
9991000
/// The upper bound of the range (exclusive).
1001+
#[stable(feature = "rust1", since = "1.0.0")]
10001002
pub end: Idx,
10011003
}
10021004

@@ -1013,11 +1015,10 @@ impl<Idx: fmt::Debug> fmt::Debug for Range<Idx> {
10131015
#[stable(feature = "rust1", since = "1.0.0")]
10141016
pub struct RangeFrom<Idx> {
10151017
/// The lower bound of the range (inclusive).
1018+
#[stable(feature = "rust1", since = "1.0.0")]
10161019
pub start: Idx,
10171020
}
10181021

1019-
1020-
10211022
#[stable(feature = "rust1", since = "1.0.0")]
10221023
impl<Idx: fmt::Debug> fmt::Debug for RangeFrom<Idx> {
10231024
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
@@ -1031,6 +1032,7 @@ impl<Idx: fmt::Debug> fmt::Debug for RangeFrom<Idx> {
10311032
#[stable(feature = "rust1", since = "1.0.0")]
10321033
pub struct RangeTo<Idx> {
10331034
/// The upper bound of the range (exclusive).
1035+
#[stable(feature = "rust1", since = "1.0.0")]
10341036
pub end: Idx,
10351037
}
10361038

@@ -1041,7 +1043,6 @@ impl<Idx: fmt::Debug> fmt::Debug for RangeTo<Idx> {
10411043
}
10421044
}
10431045

1044-
10451046
/// The `Deref` trait is used to specify the functionality of dereferencing
10461047
/// operations like `*v`.
10471048
///

branches/snap-stage3/src/libstd/process.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,7 @@ mod tests {
748748
cmd
749749
}
750750

751+
#[cfg(not(target_arch = "aarch64"))]
751752
#[test]
752753
fn test_keep_current_working_dir() {
753754
use os;

branches/snap-stage3/src/test/debuginfo/c-style-enum.rs

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

11+
// ignore-aarch64
1112
// min-lldb-version: 310
1213

1314
// compile-flags:-g

branches/snap-stage3/src/test/debuginfo/issue12886.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010

1111
// ignore-windows failing on 64-bit bots FIXME #17638
1212
// ignore-lldb
13+
// ignore-aarch64
1314

1415
// compile-flags:-g
1516

1617
// gdb-command:run
1718
// gdb-command:next
18-
// gdb-check:[...]33[...]s
19+
// gdb-check:[...]34[...]s
1920
// gdb-command:continue
2021

2122
#![omit_gdb_pretty_printer_section]

branches/snap-stage3/src/test/run-pass/sigpipe-should-be-ignored.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// Be sure that when a SIGPIPE would have been received that the entire process
1212
// doesn't die in a ball of fire, but rather it's gracefully handled.
1313

14+
// ignore-aarch64
1415
// pretty-expanded FIXME #23616
1516

1617
use std::env;

0 commit comments

Comments
 (0)