diff options
| author | Ralf Jung <post@ralfj.de> | 2018-08-06 18:45:15 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2018-08-06 18:45:15 +0200 |
| commit | 1001b2beee595db76ae9d612134271e4a971fed8 (patch) | |
| tree | 30f0603b5ec69f90a544b1ec2c8416fec0415472 | |
| parent | f47d56a55bdb940cfde1461e4371258728d8f5ad (diff) | |
| download | rust-1001b2beee595db76ae9d612134271e4a971fed8.tar.gz rust-1001b2beee595db76ae9d612134271e4a971fed8.zip | |
inore some codegen tests when debug assertions are enabled
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/test/codegen/vec-clear.rs | 1 | ||||
| -rw-r--r-- | src/test/codegen/vec-iter-collect-len.rs | 1 | ||||
| -rw-r--r-- | src/test/codegen/vec-optimizes-away.rs | 1 | ||||
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 6 |
5 files changed, 9 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 0228fdc994d..16e55ca2348 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,6 +46,8 @@ matrix: # slow to run. # OSX builders running tests, these run the full test suite. + # NO_DEBUG_ASSERTIONS=1 to make them go faster, but also do have some + # runners that run `//ignore-debug` tests. # # Note that the compiler is compiled to target 10.8 here because the Xcode # version that we're using, 8.2, cannot compile LLVM for OSX 10.7. diff --git a/src/test/codegen/vec-clear.rs b/src/test/codegen/vec-clear.rs index a73dd077cea..c44637376d7 100644 --- a/src/test/codegen/vec-clear.rs +++ b/src/test/codegen/vec-clear.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-debug: the debug assertions get in the way // compile-flags: -O #![crate_type = "lib"] diff --git a/src/test/codegen/vec-iter-collect-len.rs b/src/test/codegen/vec-iter-collect-len.rs index efb384d0afb..05cbf053444 100644 --- a/src/test/codegen/vec-iter-collect-len.rs +++ b/src/test/codegen/vec-iter-collect-len.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-debug: the debug assertions get in the way // no-system-llvm // compile-flags: -O #![crate_type="lib"] diff --git a/src/test/codegen/vec-optimizes-away.rs b/src/test/codegen/vec-optimizes-away.rs index 261564ed51a..6bef01fd4ea 100644 --- a/src/test/codegen/vec-optimizes-away.rs +++ b/src/test/codegen/vec-optimizes-away.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // +// ignore-debug: the debug assertions get in the way // no-system-llvm // compile-flags: -O #![crate_type="lib"] diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 5f68d00eab1..3fd67366a8c 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -615,12 +615,14 @@ impl Config { common::DebugInfoLldb => name == "lldb", common::Pretty => name == "pretty", _ => false, - } || (self.target != self.host && name == "cross-compile") || + } || + (self.target != self.host && name == "cross-compile") || match self.compare_mode { Some(CompareMode::Nll) => name == "compare-mode-nll", Some(CompareMode::Polonius) => name == "compare-mode-polonius", None => false, - } + } || + (cfg!(debug_assertions) && name == "debug") } else { false } |