Avoid double unlink in tests

Author: lucic71

tests/lit/lit/formats/Cpp2RustTest.py

@@ -261,14 +261,18 @@ def build_rust(self):
     def run_cpp(self):
         if self.skip_run:
             return None
-        self.cpp_result = RunResult(*lit.util.executeCommand(str(self.cpp_bin)))
+        self.cpp_result = RunResult(
+            *lit.util.executeCommand(str(self.cpp_bin), str(self.tmp_dir))
+        )
         return None
 
     def run_rust(self):
         exp = self.expectations
         if self.skip_run:
             return None
-        self.rust_result = RunResult(*lit.util.executeCommand(str(self.rust_bin)))
+        self.rust_result = RunResult(
+            *lit.util.executeCommand(str(self.rust_bin), str(self.tmp_dir))
+        )
 
         if exp.should_panic_ub:
             err = str(self.rust_result.stderr)

tests/unit/fd_io.c

@@ -4,7 +4,7 @@
 #include <unistd.h>
 
 int main(void) {
-  const char *path = "/tmp/cpp2rust_fd_io_test.tmp";
+  const char *path = "cpp2rust_fd_io_test.tmp";
   int fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
   assert(fd >= 0);
   assert(write(fd, "hello world", 11) == 11);

tests/unit/fstat.c

@@ -4,7 +4,7 @@
 #include <unistd.h>
 
 int main(void) {
-  const char *path = "/tmp/cpp2rust_fstat_test.tmp";
+  const char *path = "cpp2rust_fstat_test.tmp";
   int fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0644);
   assert(fd >= 0);
   assert(write(fd, "hello", 5) == 5);

tests/unit/isatty.c

@@ -3,7 +3,7 @@
 #include <unistd.h>
 
 int main(void) {
-  const char *path = "/tmp/cpp2rust_isatty_test.tmp";
+  const char *path = "cpp2rust_isatty_test.tmp";
   int fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0644);
   assert(fd >= 0);
   assert(isatty(fd) == 0);

tests/unit/lseek_ftruncate.c

@@ -4,7 +4,7 @@
 #include <unistd.h>
 
 int main(void) {
-  const char *path = "/tmp/cpp2rust_lseek_ftruncate_test.tmp";
+  const char *path = "cpp2rust_lseek_ftruncate_test.tmp";
   int fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0644);
   assert(fd >= 0);
   assert(write(fd, "hello world", 11) == 11);

tests/unit/out/refcount/fd_io.rs

@@ -11,7 +11,7 @@ pub fn main() {
 }
 fn main_0() -> i32 {
     let path: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal(
-        b"/tmp/cpp2rust_fd_io_test.tmp",
+        b"cpp2rust_fd_io_test.tmp",
     )));
     let fd: Value<i32> = Rc::new(RefCell::new({
         let __mode = match &[(420).into()].first() {

tests/unit/out/refcount/fstat.rs

@@ -11,7 +11,7 @@ pub fn main() {
 }
 fn main_0() -> i32 {
     let path: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal(
-        b"/tmp/cpp2rust_fstat_test.tmp",
+        b"cpp2rust_fstat_test.tmp",
     )));
     let fd: Value<i32> = Rc::new(RefCell::new({
         let __mode = match &[(420).into()].first() {

tests/unit/out/refcount/isatty.rs

@@ -11,7 +11,7 @@ pub fn main() {
 }
 fn main_0() -> i32 {
     let path: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal(
-        b"/tmp/cpp2rust_isatty_test.tmp",
+        b"cpp2rust_isatty_test.tmp",
     )));
     let fd: Value<i32> = Rc::new(RefCell::new({
         let __mode = match &[(420).into()].first() {

tests/unit/out/refcount/lseek_ftruncate.rs

@@ -11,7 +11,7 @@ pub fn main() {
 }
 fn main_0() -> i32 {
     let path: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal(
-        b"/tmp/cpp2rust_lseek_ftruncate_test.tmp",
+        b"cpp2rust_lseek_ftruncate_test.tmp",
     )));
     let fd: Value<i32> = Rc::new(RefCell::new({
         let __mode = match &[(420).into()].first() {

tests/unit/out/refcount/stdio_nofd.rs

@@ -8,7 +8,7 @@ use std::os::fd::AsFd;
 use std::rc::{Rc, Weak};
 pub fn test_fputc_fputs_0() {
     let path: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal(
-        b"/tmp/cpp2rust_stdio_nofd_puts.tmp",
+        b"cpp2rust_stdio_nofd_puts.tmp",
     )));
     let fp: Value<Ptr<::std::fs::File>> = Rc::new(RefCell::new(
         match Ptr::from_string_literal(b"wb").to_rust_string() {
@@ -154,7 +154,7 @@ pub fn test_puts_1() {
 }
 pub fn test_fgets_getc_2() {
     let path: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal(
-        b"/tmp/cpp2rust_stdio_nofd_gets.tmp",
+        b"cpp2rust_stdio_nofd_gets.tmp",
     )));
     let fp: Value<Ptr<::std::fs::File>> = Rc::new(RefCell::new(
         match Ptr::from_string_literal(b"wb").to_rust_string() {
@@ -464,7 +464,7 @@ pub fn test_fgets_getc_2() {
 }
 pub fn test_freopen_3() {
     let path: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal(
-        b"/tmp/cpp2rust_stdio_nofd_reopen.tmp",
+        b"cpp2rust_stdio_nofd_reopen.tmp",
     )));
     let fp: Value<Ptr<::std::fs::File>> = Rc::new(RefCell::new(
         match Ptr::from_string_literal(b"wb").to_rust_string() {
@@ -571,7 +571,7 @@ pub fn test_freopen_3() {
 }
 pub fn test_fseeko_4() {
     let path: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal(
-        b"/tmp/cpp2rust_stdio_nofd_seek.tmp",
+        b"cpp2rust_stdio_nofd_seek.tmp",
     )));
     let fp: Value<Ptr<::std::fs::File>> = Rc::new(RefCell::new(
         match Ptr::from_string_literal(b"wb").to_rust_string() {
@@ -758,10 +758,10 @@ pub fn test_fseeko_4() {
 }
 pub fn test_rename_5() {
     let from: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal(
-        b"/tmp/cpp2rust_stdio_nofd_from.tmp",
+        b"cpp2rust_stdio_nofd_from.tmp",
     )));
     let to: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal(
-        b"/tmp/cpp2rust_stdio_nofd_to.tmp",
+        b"cpp2rust_stdio_nofd_to.tmp",
     )));
     let fp: Value<Ptr<::std::fs::File>> = Rc::new(RefCell::new(
         match Ptr::from_string_literal(b"wb").to_rust_string() {
@@ -884,7 +884,7 @@ pub fn test_rename_5() {
 }
 pub fn test_setvbuf_6() {
     let path: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal(
-        b"/tmp/cpp2rust_stdio_nofd_vbuf.tmp",
+        b"cpp2rust_stdio_nofd_vbuf.tmp",
     )));
     let fp: Value<Ptr<::std::fs::File>> = Rc::new(RefCell::new(
         match Ptr::from_string_literal(b"wb").to_rust_string() {