Rollup merge of #74288 - haraldh:test_aslr, r=petrochenkov

Manishearth · web-flow · commit 6b2ccc7180bc · 2020-07-17T14:09:13.000-07:00
Fix src/test/run-make/static-pie/test-aslr.rs Might be subject to the birthday paradox occasionally, causing spurious failures. Addresses: #70740 (review)
diff --git a/src/test/run-make/static-pie/test-aslr.rs b/src/test/run-make/static-pie/test-aslr.rs
@@ -29,7 +29,7 @@ fn main() {
         }
         Some(s) if s.eq("--test-aslr") => {
             let cnt = run_self(&arg0);
-            if cnt != NUM_RUNS {
+            if cnt == 1 {
                 eprintln!("FAIL: {} most likely no ASLR", arg0);
                 std::process::exit(1);
             }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ fn main() {`
`29`	`29`	`}`
`30`	`30`	`Some(s) if s.eq("--test-aslr") => {`
`31`	`31`	`let cnt = run_self(&arg0);`
`32`		`- if cnt != NUM_RUNS {`
	`32`	`+ if cnt == 1 {`
`33`	`33`	`eprintln!("FAIL: {} most likely no ASLR", arg0);`
`34`	`34`	`std::process::exit(1);`
`35`	`35`	`}`