bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #83328 - tmiasko:asm-test, r=joshtriplett

Browse source 
Fixes to inline assmebly tests

* Join test thread to make assertion effective in sym.rs test case
* Use a single codegen unit to reduce non-determinism in srcloc.rs test #82886
This commit is contained in:
Yuki Okushi 2021-03-27 12:37:19 +09:00 • committed by GitHub
commit 14d0d51f6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/ui/asm/srcloc.rs
View file

@ -1,7 +1,7 @@
// min-llvm-version: 10.0.1 // min-llvm-version: 10.0.1
// only-x86_64 // only-x86_64
// build-fail // build-fail
// compile-flags: -Ccodegen-units=1
#![feature(asm)] #![feature(asm)]
// Checks that inline asm errors are mapped to the correct line in the source code. // Checks that inline asm errors are mapped to the correct line in the source code.

2
src/test/ui/asm/sym.rs
View file

@ -76,5 +76,5 @@ fn main() {
std::thread::spawn(|| { std::thread::spawn(|| {
assert_eq!(static_addr!(S1), &S1 as *const u32); assert_eq!(static_addr!(S1), &S1 as *const u32);
assert_eq!(static_tls_addr!(S2), &S2 as *const u32); assert_eq!(static_tls_addr!(S2), &S2 as *const u32);
}); }).join().unwrap();
} }