From: Cyril H. <su...@li...> - 2013-04-22 02:21:33
|
The branch, master, has been updated via 41f5eb7679e7847cef987e7dc7c37d47a1403b26 (commit) via b379380c698dc58fb9aa403c6bca0bd735e3c2e8 (commit) via 5307e933978c97d7c929ef2208ef19fef0ddfa0d (commit) from 5f070bc21e68409a106b2fcb1c48f574f2d3ee09 (commit) - Log ----------------------------------------------------------------- commit 41f5eb7679e7847cef987e7dc7c37d47a1403b26 Author: DAN LI <li...@cn...> Date: Fri Apr 19 11:36:46 2013 +0800 syscalls/adjtimex01.c: Test for mode ADJ_OFFSET_SINGLESHOT Additional test for mode ADJ_OFFSET_SINGLESHOT. Signed-off-by: DAN LI <li...@cn...> Reviewed-by: Wanlong Gao <gao...@cn...> Signed-off-by: Wanlong Gao <gao...@cn...> commit b379380c698dc58fb9aa403c6bca0bd735e3c2e8 Author: DAN LI <li...@cn...> Date: Fri Apr 19 11:32:23 2013 +0800 syscalls/adjtimex01.c: cleanup cleanup for syscalls/adjtimex01.c Signed-off-by: DAN LI <li...@cn...> Reviewed-by: Wanlong Gao <gao...@cn...> Signed-off-by: Wanlong Gao <gao...@cn...> commit 5307e933978c97d7c929ef2208ef19fef0ddfa0d Author: Wanlong Gao <gao...@cn...> Date: Mon Apr 22 10:01:13 2013 +0800 gitignore: add *.eml to gitignore The patch mail may be *.eml. Signed-off-by: Wanlong Gao <gao...@cn...> ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + testcases/kernel/syscalls/adjtimex/adjtimex01.c | 108 ++++++++--------------- 2 files changed, 38 insertions(+), 71 deletions(-) diff --git a/.gitignore b/.gitignore index 7904fba..d202037 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ patches/ *.patch *.rej *.orig +*.eml *.run-test *.test diff --git a/testcases/kernel/syscalls/adjtimex/adjtimex01.c b/testcases/kernel/syscalls/adjtimex/adjtimex01.c index 000a979..d16a5f3 100644 --- a/testcases/kernel/syscalls/adjtimex/adjtimex01.c +++ b/testcases/kernel/syscalls/adjtimex/adjtimex01.c @@ -12,57 +12,18 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, write the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * */ -/********************************************************** - * - * TEST IDENTIFIER : adjtimex01 - * - * EXECUTED BY : root / superuser - * - * TEST TITLE : Basic test for adjtimex(2) - * - * TEST CASE TOTAL : 1 - * - * AUTHOR : Saji Kumar.V.R <saj...@wi...> - * - * SIGNALS - * Uses SIGUSR1 to pause before test if option set. - * (See the parse_opts(3) man page). - * - * DESCRIPTION - * This is a Phase I test for the adjtimex(2) system call. - * It is intended to provide a limited exposure of the system call. - * - * Setup: - * Setup signal handling. - * Pause for SIGUSR1 if option specified. - * Save current parameters in tim_save - * - * Test: - * Loop if the proper options are given. - * call adjtimex with saved timex structure - * Check return value is between 0 & 5 - * Test passed - * Otherwise - * Test failed - * - * Cleanup: - * Print errno log and/or timing stats if options given - * - * USAGE: <for command-line> - * adjtimex01 [-c n] [-e] [-i n] [-I x] [-P x] [-t] [-h] [-f] [-p] - * where, -c n : Run n copies concurrently. - * -e : Turn on errno logging. - * -h : Show help screen - * -f : Turn off functional testing - * -i n : Execute test n times. - * -I x : Execute test for x seconds. - * -p : Pause for SIGUSR1 before starting - * -P x : Pause for x seconds between iterations. - * -t : Turn on syscall timing. - * - ****************************************************************/ + +/* + AUTHOR: Saji Kumar.V.R <saj...@wi...> + EXECUTED BY: root / superuser + + TEST ITEMS: + 1. Check to see if adjtimex succeed with mode combination : + ADJ_OFFSET | ADJ_FREQUENCY | ADJ_MAXERROR | ADJ_ESTERROR | + ADJ_STATUS | ADJ_TIMECONST | ADJ_TICK + 2. Check to see if adjtimex succeed with mode ADJ_OFFSET_SINGLESHOT +*/ #if defined UCLINUX && !__THROW /* workaround for libc bug causing failure in sys/timex.h */ @@ -74,20 +35,19 @@ #include "test.h" #include "usctest.h" -#define SET_MODE ( ADJ_OFFSET | ADJ_FREQUENCY | ADJ_MAXERROR | ADJ_ESTERROR | \ - ADJ_STATUS | ADJ_TIMECONST | ADJ_TICK ) +#define SET_MODE (ADJ_OFFSET | ADJ_FREQUENCY | ADJ_MAXERROR | ADJ_ESTERROR | \ + ADJ_STATUS | ADJ_TIMECONST | ADJ_TICK) -static void setup(); -static void cleanup(); +static void setup(void); +static void cleanup(void); char *TCID = "adjtimex01"; -int TST_TOTAL = 1; +int TST_TOTAL = 2; static struct timex tim_save; int main(int ac, char **av) { - int lc; char *msg; @@ -106,10 +66,26 @@ int main(int ac, char **av) TEST(adjtimex(&tim_save)); if ((TEST_RETURN >= 0) && (TEST_RETURN <= 5)) { - tst_resm(TPASS, "adjtimex() returned %ld", TEST_RETURN); + tst_resm(TPASS, "adjtimex() with mode %u returned %ld", + SET_MODE, TEST_RETURN); + } else { + tst_resm(TFAIL | TTERRNO, + "Test Failed, adjtimex() with mode %u " + "returned %ld", SET_MODE, TEST_RETURN); + } + + /* Call adjtimex(2) */ + tim_save.modes = ADJ_OFFSET_SINGLESHOT; + + TEST(adjtimex(&tim_save)); + + if ((TEST_RETURN >= 0) && (TEST_RETURN <= 5)) { + tst_resm(TPASS, "adjtimex() with mode %u returned %ld", + ADJ_OFFSET_SINGLESHOT, TEST_RETURN); } else { - tst_resm(TFAIL | TTERRNO, "Test Failed, adjtimex()" - "returned %ld", TEST_RETURN); + tst_resm(TFAIL | TTERRNO, + "Test Failed, adjtimex() with mode %u returned " + "%ld", ADJ_OFFSET_SINGLESHOT, TEST_RETURN); } } @@ -118,10 +94,8 @@ int main(int ac, char **av) tst_exit(); } -/* setup() - performs all ONE TIME setup for this test */ -void setup() +static void setup(void) { - tst_require_root(NULL); tim_save.modes = 0; @@ -136,15 +110,7 @@ void setup() "failed to save current parameters"); } -/* - *cleanup() - performs all ONE TIME cleanup for this test at - * completion or premature exit. - */ -void cleanup() +static void cleanup(void) { - /* - * print timing stats if that option was specified. - * print errno log if that option was specified. - */ TEST_CLEANUP; } hooks/post-receive -- ltp |