Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions examples/simple.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,7 @@ struct Args {
#[clap(long, default_value = "/tmp/fuser")]
data_dir: String,

// TODO: make positional like other examples.
/// Act as a client, and mount FUSE at given path
#[clap(long, default_value = "")]
mount_point: String,
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Preserve --mount-point compatibility for simple example

Making mount_point positional here removes the --mount-point flag that existing repo tooling still uses, so those invocations now fail argument parsing before mount starts (for example fuser-tests/src/commands/simple.rs:31-37, fuser-tests/src/commands/mount.rs:247, fuser-tests/src/experimental.rs:161, and tests/bsd_pjdfs.sh:21 all pass --mount-point). This commit therefore breaks the current test/scripts workflow unless all callers are updated in lockstep or a compatibility alias is kept.

Useful? React with 👍 / 👎.


/// Mount FUSE with direct IO
Expand Down
2 changes: 1 addition & 1 deletion fuser-tests/src/commands/mount.rs
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ async fn test_no_user_allow_other(features: &[Feature], libfuse: &Libfuse) -> an

// Run the simple example as fusertestnoallow
let run_command = format!(
"{} --auto-unmount -vvv --data-dir {} --mount-point {}",
"{} --auto-unmount -vvv --data-dir {} {}",
simple_exe.display(),
data_dir.path().display(),
mount_dir.path().display()
Expand Down
1 change: 0 additions & 1 deletion fuser-tests/src/commands/simple.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ pub(crate) async fn run_simple_tests() -> anyhow::Result<()> {
"-vvv",
"--data-dir",
data_dir.path().to_str().unwrap(),
"--mount-point",
mount_dir.path().to_str().unwrap(),
])
.env(Fusermount::ENV_VAR, Fusermount::False.as_path())
Expand Down
2 changes: 1 addition & 1 deletion fuser-tests/src/experimental.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ async fn test_no_user_allow_other(features: &[Feature], libfuse: &Libfuse) -> an

// Run the simple example as fusertestnoallow
let run_command = format!(
"{} --auto-unmount -vvv --data-dir {} --mount-point {}",
"{} --auto-unmount -vvv --data-dir {} {}",
simple_exe.display(),
data_dir.path().display(),
mount_dir.path().display()
Expand Down
2 changes: 1 addition & 1 deletion pjdfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export RUST_BACKTRACE=1
DATA_DIR=$(mktemp --directory)
DIR=$(mktemp --directory)

fuser -vvv --auto-unmount --suid --data-dir $DATA_DIR --mount-point $DIR > /code/logs/mount.log 2>&1 &
fuser -vvv --auto-unmount --suid --data-dir $DATA_DIR $DIR > /code/logs/mount.log 2>&1 &
FUSE_PID=$!
sleep 0.5

Expand Down
2 changes: 1 addition & 1 deletion tests/bsd_pjdfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ DATA_DIR=$(mktemp --directory)
DIR=$(mktemp --directory)

cargo build --release --example simple
cargo run --release --example simple -- -vvv --suid --data-dir $DATA_DIR --mount-point $DIR > /tmp/mount.log 2>&1 &
cargo run --release --example simple -- -vvv --suid --data-dir $DATA_DIR $DIR > /tmp/mount.log 2>&1 &
FUSE_PID=$!
sleep 0.5

Expand Down
2 changes: 1 addition & 1 deletion tests/macos_pjdfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ DATA_DIR=$(mktemp --directory)
DIR=$(mktemp --directory)

cargo build --release --example simple
cargo run --release --example simple -- -vvv --suid --data-dir $DATA_DIR --mount-point $DIR > /tmp/mount.log 2>&1 &
cargo run --release --example simple -- -vvv --suid --data-dir $DATA_DIR $DIR > /tmp/mount.log 2>&1 &
FUSE_PID=$!
sleep 0.5

Expand Down
Loading