split path rename trailing slash test into files and dirs

files fail on both platform, dirs pass on both! so, same bug!
This commit is contained in:
Pat Hickey
2021-01-27 14:55:39 -08:00
parent 6c0f312a1b
commit d1160cb9b5
2 changed files with 43 additions and 10 deletions

View File

@@ -0,0 +1,39 @@
use std::{env, process};
use wasi_tests::open_scratch_directory;
unsafe fn test_path_rename_trailing_slashes(dir_fd: wasi::Fd) {
// Test renaming a directory with a trailing slash in the name.
wasi::path_create_directory(dir_fd, "source").expect("creating a directory");
wasi::path_rename(dir_fd, "source/", dir_fd, "target")
.expect("renaming a directory with a trailing slash in the source name");
wasi::path_rename(dir_fd, "target", dir_fd, "source/")
.expect("renaming a directory with a trailing slash in the destination name");
wasi::path_rename(dir_fd, "source/", dir_fd, "target/")
.expect("renaming a directory with a trailing slash in the source and destination names");
wasi::path_rename(dir_fd, "target", dir_fd, "source")
.expect("renaming a directory with no trailing slashes at all should work");
wasi::path_remove_directory(dir_fd, "source").expect("removing the directory");
}
fn main() {
let mut args = env::args();
let prog = args.next().unwrap();
let arg = if let Some(arg) = args.next() {
arg
} else {
eprintln!("usage: {} <scratch directory>", prog);
process::exit(1);
};
// Open scratch directory
let dir_fd = match open_scratch_directory(&arg) {
Ok(dir_fd) => dir_fd,
Err(err) => {
eprintln!("{}", err);
process::exit(1)
}
};
// Run the tests.
unsafe { test_path_rename_trailing_slashes(dir_fd) }
}

View File

@@ -5,6 +5,10 @@ unsafe fn test_path_rename_trailing_slashes(dir_fd: wasi::Fd) {
// Test renaming a file with a trailing slash in the name. // Test renaming a file with a trailing slash in the name.
create_file(dir_fd, "source"); create_file(dir_fd, "source");
wasi::path_rename(dir_fd, "source", dir_fd, "target")
.expect("no trailing slashes rename works");
wasi::path_rename(dir_fd, "target", dir_fd, "source").expect("rename it back to source");
assert_eq!( assert_eq!(
wasi::path_rename(dir_fd, "source/", dir_fd, "target") wasi::path_rename(dir_fd, "source/", dir_fd, "target")
.expect_err("renaming a file with a trailing slash in the source name should fail") .expect_err("renaming a file with a trailing slash in the source name should fail")
@@ -27,16 +31,6 @@ unsafe fn test_path_rename_trailing_slashes(dir_fd: wasi::Fd) {
"errno should be ERRNO_NOTDIR" "errno should be ERRNO_NOTDIR"
); );
wasi::path_unlink_file(dir_fd, "source").expect("removing a file"); wasi::path_unlink_file(dir_fd, "source").expect("removing a file");
// Test renaming a directory with a trailing slash in the name.
wasi::path_create_directory(dir_fd, "source").expect("creating a directory");
wasi::path_rename(dir_fd, "source/", dir_fd, "target")
.expect("renaming a directory with a trailing slash in the source name");
wasi::path_rename(dir_fd, "target", dir_fd, "source/")
.expect("renaming a directory with a trailing slash in the destination name");
wasi::path_rename(dir_fd, "source/", dir_fd, "target/")
.expect("renaming a directory with a trailing slash in the source and destination names");
wasi::path_remove_directory(dir_fd, "target").expect("removing a directory");
} }
fn main() { fn main() {