From b40754f0f75aebcd63ad3b91ac2f94d54bc1c423 Mon Sep 17 00:00:00 2001 From: Alex Burka Date: Sun, 21 Aug 2016 23:49:22 +0000 Subject: [PATCH 1/2] modify fds-are-cloexec test to open a file that exists Fixes #35753. --- src/test/run-pass/fds-are-cloexec.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/run-pass/fds-are-cloexec.rs b/src/test/run-pass/fds-are-cloexec.rs index c2916ccd75b8e..b7ce622bf563e 100644 --- a/src/test/run-pass/fds-are-cloexec.rs +++ b/src/test/run-pass/fds-are-cloexec.rs @@ -34,7 +34,7 @@ fn main() { } fn parent() { - let file = File::open("Makefile").unwrap(); + let file = File::open("src/test/run-pass/fds-are-cloexec.rs").unwrap(); let tcp1 = TcpListener::bind("127.0.0.1:0").unwrap(); let tcp2 = tcp1.try_clone().unwrap(); let addr = tcp1.local_addr().unwrap(); From b2cd3e59b88e6d69e92b28f7cfb8502f62bba94d Mon Sep 17 00:00:00 2001 From: Alex Burka Date: Thu, 25 Aug 2016 12:39:25 -0400 Subject: [PATCH 2/2] use file!() even though it shouldn't be necessary --- src/test/run-pass/fds-are-cloexec.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/run-pass/fds-are-cloexec.rs b/src/test/run-pass/fds-are-cloexec.rs index b7ce622bf563e..7d49bd25309f5 100644 --- a/src/test/run-pass/fds-are-cloexec.rs +++ b/src/test/run-pass/fds-are-cloexec.rs @@ -34,7 +34,7 @@ fn main() { } fn parent() { - let file = File::open("src/test/run-pass/fds-are-cloexec.rs").unwrap(); + let file = File::open(file!()).unwrap(); let tcp1 = TcpListener::bind("127.0.0.1:0").unwrap(); let tcp2 = tcp1.try_clone().unwrap(); let addr = tcp1.local_addr().unwrap();