From 92c4650ac809ee227c6591397a64269850f3217e Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Wed, 1 Oct 2014 06:50:02 +0200 Subject: Regression test portability: useradd/userdell Adjust useradd/userdel flags for NetBSD. Similar work will have to be done for other non Linux systems BUG: 1129939 Change-Id: I2a30819a4915d04473f0ef0c0c063de6015212a1 Signed-off-by: Emmanuel Dreyfus Reviewed-on: http://review.gluster.org/8895 Reviewed-by: Xavier Hernandez Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY --- tests/include.rc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'tests') diff --git a/tests/include.rc b/tests/include.rc index 56366eda083..3af4764b1e4 100644 --- a/tests/include.rc +++ b/tests/include.rc @@ -615,6 +615,26 @@ which sha1sum > /dev/null || { } } +userdel --help 2>/dev/null | grep -q -- '--force' || { + userdel() { + if [ "x$1" = "x--force" ]; then + user=$2 + else + user=$1 + fi + eval "$( which userdel ) $user" + } +} + +useradd --help 2>/dev/null | grep -q -- '--no-create-home' || { + useradd() { + # Just remove -M (do not create home) which is the default + # other options are identical + args=`echo $*|sed 's/-M//'` + eval "$( which useradd ) $args" + } +} + alias EXPECT='_EXPECT $LINENO' alias EXPECT_NOT='_EXPECT_NOT $LINENO' alias TEST='_TEST $LINENO' -- cgit