tests: (setarch) use long options to improve test coverage report

Signed-off-by: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>

diff --git a/tests/ts/misc/setarch b/tests/ts/misc/setarch
index e7b6ff34c1ae3ab6dac220571a2ff81b912e6f17..801e009359d31a6518fb915be6dbe74104fcc94c 100755 (executable)
--- a/tests/ts/misc/setarch
+++ b/tests/ts/misc/setarch
@@ -25,16 +25,16 @@ ARCH=$(uname -m)
 
 ts_init_subtest options
 ts_log_both "###### unknown arch"
-$TS_CMD_SETARCH qubit -v echo "success" >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SETARCH qubit --verbose echo "success" >> $TS_OUTPUT 2>> $TS_ERRLOG
 echo "exit: $?" >>$TS_OUTPUT
 
 ts_log_both "###### unknown command"
-$TS_CMD_SETARCH $ARCH -v /das/gibs/nicht >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SETARCH $ARCH --verbose /das/gibs/nicht >> $TS_OUTPUT 2>> $TS_ERRLOG
 echo "exit: $?" >>$TS_OUTPUT
 
 echo "###### noop uname -a" >>$TS_OUTPUT
 uname_a=$(uname -srm)
-$TS_CMD_SETARCH $ARCH -v uname -srm >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_SETARCH $ARCH --verbose uname -srm >> $TS_OUTPUT 2>> $TS_ERRLOG
 sed -i "$ s@${uname_a}@uname -a unchanged@" $TS_OUTPUT
 
 echo "###### almost all options" >>$TS_OUTPUT
@@ -46,7 +46,7 @@ ts_init_subtest uname26
 finmsg="" # for debugging 2.6 issues
 
 echo "###### --uname-2.6 echo" >>$TS_OUTPUT
-$TS_CMD_SETARCH $ARCH -v --uname-2.6 echo "2.6 worked" >> $TS_OUTPUT 2>&1
+$TS_CMD_SETARCH $ARCH --verbose --uname-2.6 echo "2.6 worked" >> $TS_OUTPUT 2>&1
 if [ $? -eq 0 ]; then
        expected='^2.6 worked$'
 else

diff --git a/tests/ts/setarch/show-with-pid b/tests/ts/setarch/show-with-pid
index 8f5c4391fbb3763875d5ba93dc27612eac3abd9b..b703f150ced027285a8cbb68045a425a196fce80 100755 (executable)
--- a/tests/ts/setarch/show-with-pid
+++ b/tests/ts/setarch/show-with-pid
@@ -33,7 +33,7 @@ fi
 SKIP_REASON=
 {
     PID=
-    coproc BASH { "$TS_CMD_SETARCH" -R bash -c 'echo $$; cat'; }
+    coproc BASH { "$TS_CMD_SETARCH" --addr-no-randomize bash -c 'echo $$; cat'; }
     if read -u ${BASH[0]} PID; then
        personality_file="/proc/$PID/personality"
        if personality=$(cat "$personality_file"); then