A check routine for acct implementation is added at the beginning of the test. check_acct_in_kernel function calls acct(NULL) and checks if errno is ENOSYS. It means that acct system call is not implemented in kernel. The other ENOSYS check routines in setup are removed.
This patch prevents from unintentional calling acct again in cleanup, which makes TCONF to TBROK and helps configuration problems stay as TCONF. Previous test output: (becomes TBROK in the end) acct01 1 TCONF : BSD process accounting is not configured in this kernel acct01 2 TCONF : Remaining cases not appropriate for configuration acct01 3 TBROK : acct(NULL) failed: errno=ENOSYS(38): Function not implemented Fixed test output: (stays as TCONF) acct01 1 TCONF : BSD process accounting is not configured in this kernel Signed-off-by: Honggyu Kim <[email protected]> --- testcases/kernel/syscalls/acct/acct01.c | 32 +++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/testcases/kernel/syscalls/acct/acct01.c b/testcases/kernel/syscalls/acct/acct01.c index 8236042..4a34383 100644 --- a/testcases/kernel/syscalls/acct/acct01.c +++ b/testcases/kernel/syscalls/acct/acct01.c @@ -124,12 +124,28 @@ int main(int argc, char *argv[]) tst_exit(); } +static void check_acct_in_kernel(void) +{ + /* check if acct is implemented in kernel */ + if (acct(NULL) == -1) { + if (errno == ENOSYS) { + tst_resm(TCONF, + "BSD process accounting is not configured in " + "this kernel"); + + tst_exit(); + } + } +} + static void setup(void) { int fd; tst_require_root(NULL); + check_acct_in_kernel(); + tst_tmpdir(); ltpuser = SAFE_GETPWNAM(cleanup, "nobody"); @@ -138,24 +154,12 @@ static void setup(void) SAFE_CLOSE(cleanup, fd); if (acct(TEST_FILE5) == -1) { - if (errno == ENOSYS) { - tst_brkm(TCONF, cleanup, - "BSD process accounting is not configured in " - "this kernel"); - } else { - tst_brkm(TBROK | TERRNO, cleanup, "acct failed unexpectedly"); - } + tst_brkm(TBROK | TERRNO, cleanup, "acct failed unexpectedly"); } /* turn off acct, so we are in a known state */ if (acct(NULL) == -1) { - if (errno == ENOSYS) { - tst_brkm(TCONF, cleanup, - "BSD process accounting is not configured in " - "this kernel"); - } else { - tst_brkm(TBROK | TERRNO, cleanup, "acct(NULL) failed"); - } + tst_brkm(TBROK | TERRNO, cleanup, "acct(NULL) failed"); } /* ELOOP SETTING */ -- 1.7.9.5 ------------------------------------------------------------------------------ November Webinars for C, C++, Fortran Developers Accelerate application performance with scalable programming models. Explore techniques for threading, error checking, porting, and tuning. Get the most from the latest Intel processors and coprocessors. See abstracts and register http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
