tests: Rename prepare_virtiofsd_rs_daemon

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-02-21 09:54:13 +00:00
parent e3bb822c4e
commit 75fbea3c46

View File

@ -72,7 +72,7 @@ const DIRECT_KERNEL_BOOT_CMDLINE: &str =
const CONSOLE_TEST_STRING: &str = "Started OpenBSD Secure Shell server"; const CONSOLE_TEST_STRING: &str = "Started OpenBSD Secure Shell server";
fn prepare_virtiofsd_rs_daemon( fn prepare_virtiofsd(
tmp_dir: &TempDir, tmp_dir: &TempDir,
shared_dir: &str, shared_dir: &str,
cache: &str, cache: &str,
@ -2754,14 +2754,7 @@ mod parallel {
#[test] #[test]
#[cfg(not(feature = "mshv"))] #[cfg(not(feature = "mshv"))]
fn test_virtio_fs_dax_on_default_cache_size() { fn test_virtio_fs_dax_on_default_cache_size() {
test_virtio_fs( test_virtio_fs(true, None, "never", &prepare_virtiofsd, false, None)
true,
None,
"never",
&prepare_virtiofsd_rs_daemon,
false,
None,
)
} }
#[test] #[test]
@ -2771,7 +2764,7 @@ mod parallel {
true, true,
Some(0x4000_0000), Some(0x4000_0000),
"never", "never",
&prepare_virtiofsd_rs_daemon, &prepare_virtiofsd,
false, false,
None, None,
) )
@ -2779,39 +2772,18 @@ mod parallel {
#[test] #[test]
fn test_virtio_fs_dax_off() { fn test_virtio_fs_dax_off() {
test_virtio_fs( test_virtio_fs(false, None, "never", &prepare_virtiofsd, false, None)
false,
None,
"never",
&prepare_virtiofsd_rs_daemon,
false,
None,
)
} }
#[test] #[test]
#[cfg(not(feature = "mshv"))] #[cfg(not(feature = "mshv"))]
fn test_virtio_fs_hotplug_dax_on() { fn test_virtio_fs_hotplug_dax_on() {
test_virtio_fs( test_virtio_fs(true, None, "never", &prepare_virtiofsd, true, None)
true,
None,
"never",
&prepare_virtiofsd_rs_daemon,
true,
None,
)
} }
#[test] #[test]
fn test_virtio_fs_hotplug_dax_off() { fn test_virtio_fs_hotplug_dax_off() {
test_virtio_fs( test_virtio_fs(false, None, "never", &prepare_virtiofsd, true, None)
false,
None,
"never",
&prepare_virtiofsd_rs_daemon,
true,
None,
)
} }
#[test] #[test]
@ -2821,7 +2793,7 @@ mod parallel {
true, true,
Some(0x4000_0000), Some(0x4000_0000),
"never", "never",
&prepare_virtiofsd_rs_daemon, &prepare_virtiofsd,
true, true,
Some(15), Some(15),
) )
@ -2834,7 +2806,7 @@ mod parallel {
true, true,
Some(0x4000_0000), Some(0x4000_0000),
"never", "never",
&prepare_virtiofsd_rs_daemon, &prepare_virtiofsd,
false, false,
Some(15), Some(15),
) )