Merge pull request #214 from keszybz/fix-invocations

Fix invocations

Author: keszybz

.github/workflows/ci.yml

@@ -47,6 +47,8 @@ jobs:
         run: make program CARGOFLAGS="--verbose"
       - name: Run tests
         run: make check CARGOFLAGS="--verbose"
+      - name: Check program invocation
+        run: tests/test-invocations.sh target/release/zram-generator
 
   rustfmt:
     name: rustfmt

src/main.rs

@@ -49,13 +49,13 @@ fn command() -> clap::Command {
 fn get_opts() -> Opts {
     let opts = command().get_matches();
 
-    if let Some(val) = opts.get_one::<&str>("setup-device") {
-        Opts::SetupDevice(val.to_string())
-    } else if let Some(val) = opts.get_one::<&str>("reset-device") {
-        Opts::ResetDevice(val.to_string())
+    if let Some(val) = opts.get_one::<String>("setup-device") {
+        Opts::SetupDevice(val.clone())
+    } else if let Some(val) = opts.get_one::<String>("reset-device") {
+        Opts::ResetDevice(val.clone())
     } else {
-        let val = opts.get_one::<&str>("dir").expect("clap invariant");
-        Opts::GenerateUnits(val.to_string())
+        let val = opts.get_one::<String>("dir").expect("clap invariant");
+        Opts::GenerateUnits(val.clone())
     }
 }
 

tests/test-invocations.sh

@@ -0,0 +1,42 @@
+# SPDX-License-Identifier: MIT
+set -e
+
+program=${1:?}
+
+dir=$(mktemp -d 'zram-test.XXXXXX')
+trap 'rm -r $dir' EXIT
+
+set -x
+
+$program --help
+$program --version
+
+# This should pass
+mkdir $dir/{a,b,c}
+$program $dir/{a,b,c}
+
+# Those should fail with option parsing error (2)
+set +e
+$program dir1 dir2 dir3 dir4
+ret=$?
+set -e
+test $ret -eq 2
+
+set +e
+$program dir1 --setup-device
+ret=$?
+set -e
+test $ret -eq 2
+
+# Those should fail because the device doesn't exist (1)
+set +e
+$program --setup-device /no/such/file/or/directory
+ret=$?
+set -e
+test $ret -eq 1
+
+set +e
+$program --reset-device /no/such/file/or/directory
+ret=$?
+set -e
+test $ret -eq 1