From adc9f3d47992261a8d5a00d5a9d78259f6892708 Mon Sep 17 00:00:00 2001 From: Mark McCaskey Date: Fri, 8 Nov 2019 16:33:08 -0800 Subject: [PATCH] Explicitly delete temp file in fd_append test --- lib/wasi-tests/wasitests/fd_append.rs | 19 +++++++++++-------- lib/wasi-tests/wasitests/fd_append.wasm | Bin 81276 -> 81710 bytes 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/wasi-tests/wasitests/fd_append.rs b/lib/wasi-tests/wasitests/fd_append.rs index f1e55c5ed9a..2e311652e4d 100644 --- a/lib/wasi-tests/wasitests/fd_append.rs +++ b/lib/wasi-tests/wasitests/fd_append.rs @@ -35,14 +35,17 @@ fn main() { file_handle.write(STR2.as_bytes()).unwrap(); } - let mut file_handle = OpenOptions::new() - .read(true) - .open(&file) - .expect("Couldn't reopen file to read"); + { + let mut file_handle = OpenOptions::new() + .read(true) + .open(&file) + .expect("Couldn't reopen file to read"); - let mut test = String::new(); - file_handle.read_to_string(&mut test); + let mut test = String::new(); + file_handle.read_to_string(&mut test); - assert_eq!(&test, &format!("{}{}", STR1, STR2)); - println!("{:?}", &test); + assert_eq!(&test, &format!("{}{}", STR1, STR2)); + println!("{:?}", &test); + } + std::fs::remove_file(&file).unwrap(); } diff --git a/lib/wasi-tests/wasitests/fd_append.wasm b/lib/wasi-tests/wasitests/fd_append.wasm index b1c73d14fabb4fb89b4b6f6b98cccaba60375200..af40f8af9c1bfb0d797456efec53ae52a84e48c8 100755 GIT binary patch delta 8280 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 PDN&Ln&s{5Ra4zwG8*0t- delta 8090 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 HPAC5#2H&xV