@@ -36,17 +36,10 @@ static void add_user(void)
return;
const char *const cmd_useradd[] = {"useradd", username, NULL};
- int rc;
-
- switch ((rc = tst_run_cmd(cmd_useradd, NULL, NULL,
- TST_RUN_CMD_PASS_EXIT_VAL))) {
- case 0:
- user_added = 1;
- ltpuser = SAFE_GETPWNAM(username);
- break;
- default:
- tst_brk(TBROK, "useradd failed (%d)", rc);
- }
+
+ SAFE_RUN_CMD(cmd_useradd, NULL, NULL);
+ user_added = 1;
+ ltpuser = SAFE_GETPWNAM(username);
sprintf(fmt, "%5u: %%*5d %%*d/%%*d %%d/%%d %%d/%%d", ltpuser->pw_uid);
}
@@ -162,15 +162,8 @@ static struct tcase {
static void setup(void)
{
const char *const cmd[] = {"quotacheck", "-ugF", "vfsv0", MNTPOINT, NULL};
- int ret;
-
- ret = tst_run_cmd(cmd, NULL, NULL, TST_RUN_CMD_PASS_EXIT_VAL);
- switch (ret) {
- case 0:
- break;
- default:
- tst_brk(TBROK, "quotacheck exited with %i", ret);
- }
+
+ SAFE_RUN_CMD(cmd, NULL, NULL);
test_id = geteuid();
if (access(USRPATH, F_OK) == -1)
@@ -146,16 +146,9 @@ static void verify_quotactl(unsigned int n)
static void setup(void)
{
const char *const cmd[] = {"quotacheck", "-uF", "vfsv0", MNTPOINT, NULL};
- int ret;
unsigned int i;
- ret = tst_run_cmd(cmd, NULL, NULL, TST_RUN_CMD_PASS_EXIT_VAL);
- switch (ret) {
- case 0:
- break;
- default:
- tst_brk(TBROK, "quotacheck exited with %i", ret);
- }
+ SAFE_RUN_CMD(cmd, NULL, NULL);
if (access(USRPATH, F_OK) == -1)
tst_brk(TFAIL | TERRNO, "user quotafile didn't exist");