Skip to content

Commit

Permalink
Rollup merge of rust-lang#83328 - tmiasko:asm-test, r=joshtriplett
Browse files Browse the repository at this point in the history
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 rust-lang#82886
  • Loading branch information
Dylan-DPC committed Mar 26, 2021
2 parents 91c019e + 3d64f8d commit 65bda37
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/test/ui/asm/srcloc.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// min-llvm-version: 10.0.1
// only-x86_64
// build-fail

// compile-flags: -Ccodegen-units=1
#![feature(asm)]

// Checks that inline asm errors are mapped to the correct line in the source code.
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/asm/sym.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,5 @@ fn main() {
std::thread::spawn(|| {
assert_eq!(static_addr!(S1), &S1 as *const u32);
assert_eq!(static_tls_addr!(S2), &S2 as *const u32);
});
}).join().unwrap();
}

0 comments on commit 65bda37

Please sign in to comment.