* [LTP] [PATCH ltp] su01: do pre-checking to avoid annoying warning
@ 2016-12-16 0:53 Ning, Han
2017-01-18 10:26 ` Cyril Hrubis
0 siblings, 1 reply; 2+ messages in thread
From: Ning, Han @ 2016-12-16 0:53 UTC (permalink / raw)
To: ltp
From: Ning Han <ningx.han@intel.com>
Signed-off-by: Ning Han <ningx.han@intel.com>
---
testcases/commands/su/su01 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/testcases/commands/su/su01 b/testcases/commands/su/su01
index dd1517f..41441de 100755
--- a/testcases/commands/su/su01
+++ b/testcases/commands/su/su01
@@ -86,7 +86,7 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
#Create 1st test user
#erase user if he may exist , so we can have a clean en
rm -rf /home/$TEST_USER1
- userdel $TEST_USER1
+ getent passwd $TEST_USER1 &> /dev/null && userdel $TEST_USER1
sleep 1
useradd -m -g users $TEST_USER1
@@ -105,7 +105,7 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
then {
USER_UID=`id -u $TEST_USER1`
USER_GID=`id -g $TEST_USER1`
- mkdir $TEST_USER1_HOMEDIR
+ mkdir -p $TEST_USER1_HOMEDIR
chown -R $USER_UID.$USER_GID $TEST_USER1_HOMEDIR
}
fi
@@ -121,7 +121,7 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
#Create 2nd test user
#erase user if he may exist , so we can have a clean en
rm -rf /home/$TEST_USER2
- userdel $TEST_USER2
+ getent passwd $TEST_USER2 &> /dev/null && userdel $TEST_USER2
sleep 1
useradd -m -g users $TEST_USER2
@@ -141,7 +141,7 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
then {
USER_UID=`id -u $TEST_USER2`
USER_GID=`id -g $TEST_USER2`
- mkdir $TEST_USER2_HOMEDIR
+ mkdir -p $TEST_USER2_HOMEDIR
chown -R $USER_UID.$USER_GID $TEST_USER2_HOMEDIR
}
fi
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [LTP] [PATCH ltp] su01: do pre-checking to avoid annoying warning
2016-12-16 0:53 [LTP] [PATCH ltp] su01: do pre-checking to avoid annoying warning Ning, Han
@ 2017-01-18 10:26 ` Cyril Hrubis
0 siblings, 0 replies; 2+ messages in thread
From: Cyril Hrubis @ 2017-01-18 10:26 UTC (permalink / raw)
To: ltp
Hi!
> ---
> testcases/commands/su/su01 | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/testcases/commands/su/su01 b/testcases/commands/su/su01
> index dd1517f..41441de 100755
> --- a/testcases/commands/su/su01
> +++ b/testcases/commands/su/su01
> @@ -86,7 +86,7 @@ rm -f $TEST_ENV_FILE > /dev/null 2>&1
> #Create 1st test user
> #erase user if he may exist , so we can have a clean en
> rm -rf /home/$TEST_USER1
> - userdel $TEST_USER1
> + getent passwd $TEST_USER1 &> /dev/null && userdel $TEST_USER1
^
This is a bashism, portable way to
redirect both streams is > /dev/null 2>&1
Upon closer look I've found and fixed two cases of bashism and pushed,
thanks.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-18 10:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-16 0:53 [LTP] [PATCH ltp] su01: do pre-checking to avoid annoying warning Ning, Han
2017-01-18 10:26 ` Cyril Hrubis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox