Skip to content

Commit 1001b2b

Browse files
committed
inore some codegen tests when debug assertions are enabled
1 parent f47d56a commit 1001b2b

File tree

5 files changed

+9
-2
lines changed

5 files changed

+9
-2
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ matrix:
4646
# slow to run.
4747

4848
# OSX builders running tests, these run the full test suite.
49+
# NO_DEBUG_ASSERTIONS=1 to make them go faster, but also do have some
50+
# runners that run `//ignore-debug` tests.
4951
#
5052
# Note that the compiler is compiled to target 10.8 here because the Xcode
5153
# version that we're using, 8.2, cannot compile LLVM for OSX 10.7.

src/test/codegen/vec-clear.rs

+1
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-debug: the debug assertions get in the way
1112
// compile-flags: -O
1213

1314
#![crate_type = "lib"]

src/test/codegen/vec-iter-collect-len.rs

+1
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-debug: the debug assertions get in the way
1112
// no-system-llvm
1213
// compile-flags: -O
1314
#![crate_type="lib"]

src/test/codegen/vec-optimizes-away.rs

+1
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-debug: the debug assertions get in the way
1112
// no-system-llvm
1213
// compile-flags: -O
1314
#![crate_type="lib"]

src/tools/compiletest/src/header.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -615,12 +615,14 @@ impl Config {
615615
common::DebugInfoLldb => name == "lldb",
616616
common::Pretty => name == "pretty",
617617
_ => false,
618-
} || (self.target != self.host && name == "cross-compile") ||
618+
} ||
619+
(self.target != self.host && name == "cross-compile") ||
619620
match self.compare_mode {
620621
Some(CompareMode::Nll) => name == "compare-mode-nll",
621622
Some(CompareMode::Polonius) => name == "compare-mode-polonius",
622623
None => false,
623-
}
624+
} ||
625+
(cfg!(debug_assertions) && name == "debug")
624626
} else {
625627
false
626628
}

0 commit comments

Comments
 (0)