[LTP] [PATCH v2 1/4] delete_module/delete_module01.c: cleanup

[LTP] [PATCH v2 1/4] delete_module/delete_module01.c: cleanup

[Xiaoguang Wang]

* Delete some useless commtents.
* Use SAFE_* macros.
* Some cleanup and fixes.

Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
---
 .../kernel/module/delete_module/delete_module01.c  | 148 +++++----------------
 1 file changed, 36 insertions(+), 112 deletions(-)

diff --git a/testcases/kernel/module/delete_module/delete_module01.c b/testcases/kernel/module/delete_module/delete_module01.c
index b96564d..cb1a7fb 100644
--- a/testcases/kernel/module/delete_module/delete_module01.c
+++ b/testcases/kernel/module/delete_module/delete_module01.c
@@ -14,157 +14,81 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
-/**********************************************************
- *
- *    TEST IDENTIFIER   : delete_module01
- *
- *    EXECUTED BY       : root / superuser
- *
- *    TEST TITLE        : Basic tests for delete_module(2)
- *
- *    TEST CASE TOTAL   : 1
- *
- *    AUTHOR            : Madhu T L <madhu.tarikere@wipro.com>
- *
- *    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 delete_module(2) system call.
- *		 It is intended to provide limited exposure of the system call.
- *
- *		 Setup:
- *		   Setup signal handling.
- *		   Test caller is superuser
- *		   Pause for SIGUSR1 if option specified.
- *		   Initialize modname for each child process.
- *
- *		 Test:
- *		  Loop if the proper options are given.
- *		   Create module entry
- *		   Execute system call
- *		   Check return code, if system call failed (return=-1),
- *		   	issue a FAIL message with the errno.
- *		   Otherwise, Issue PASS message.
- *
- *		 Cleanup:
- *		   Print errno log and/or timing stats if options given
- *
- * USAGE:  <for command-line>
- *  delete_module01 [-c n] [-e] [-f] [-h] [-i n] [-I x] [-p] [-P x] [-t]
- *		 		 where,  -c n : Run n copies concurrently.
- *			 		 -e   : Turn on errno logging.
- *		 	 		 -f   : Turn off functional testing
- *		 	 		 -h   : Show help screen
- *		 	 		 -i n : Execute test n times.
- *		 	 		 -I x : Execute test for x seconds.
- *		 	 		 -p   : Pause for SIGUSR1 before
- *		 	 		 	starting test.
- *		 	 		 -P x : Pause for x seconds between
- *		 	 		 	iterations.
- *		 	 		 -t   : Turn on syscall timing.
+
+/*
+ *    AUTHOR: Madhu T L <madhu.tarikere@wipro.com>
  *
- ****************************************************************/
+ *    DESCRIPTION:
+ *    	Basic tests for delete_module(2)
+ *    	1) insmod dummy_del_mod.ko
+ *    	2) call delete_module(2) to remove dummy_del_mod.ko
+ */
 
-#include <libgen.h>
 #include <errno.h>
 #include "test.h"
 #include "usctest.h"
+#include "tst_module.h"
+#include "safe_macros.h"
+#include "linux_syscall_numbers.h"
+
+#define MODULE_NAME	"dummy_del_mod"
+#define MODULE_NAME_KO	"dummy_del_mod.ko"
 
 static void setup(void);
 static void cleanup(void);
 
-char *TCID = "delete_module01";	/* Test program identifier.    */
-int TST_TOTAL = 1;		/* Total number of test cases. */
+
+char *TCID = "delete_module01";
+int TST_TOTAL = 1;
+static int module_loaded;
 
 int main(int argc, char **argv)
 {
 	int lc;
 	char *msg;
-	char cmd[PATH_MAX];
-	char *module_name = "dummy_del_mod";
 
-	if ((msg = parse_opts(argc, argv, NULL, NULL)) != (char *)NULL) {
+	msg = parse_opts(argc, argv, NULL, NULL);
+	if (msg != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
 
 	setup();
 
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset tst_count in case we are looping */
 		tst_count = 0;
 
-		/* Execute system call */
-		sprintf(cmd, "/sbin/insmod %s/%s.ko", dirname(argv[0]),
-			module_name);
-
-		/* Insmod the module */
-		if ((system(cmd)) != 0) {
-			tst_resm(TBROK, "Failed to load %s module",
-				 module_name);
-			printf("system() failed; cannot test init_module: "
-			       "errno=%i\n", errno);
-			goto EXIT;
+		/* insert dummy_del_mod.ko */
+		if (module_loaded == 0) {
+			tst_module_load(NULL, MODULE_NAME_KO, NULL);
+			module_loaded = 1;
 		}
 
-		/* Test the system call */
-		TEST(delete_module(module_name));
-
-		/* check return code */
+		TEST(ltp_syscall(__NR_delete_module, MODULE_NAME, 0));
 		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL, "delete_module() failed to remove"
-				 " module entry for %s, errno=%d : %s",
-				 module_name, TEST_ERRNO, strerror(TEST_ERRNO));
+			tst_resm(TFAIL | TTERRNO, "delete_module() failed to "
+				 "remove module entry for %s ", MODULE_NAME);
 		} else {
-			tst_resm(TPASS, "delete_module() successful, returned"
-				 " %d", TEST_RETURN);
+			tst_resm(TPASS, "delete_module() successful");
+			module_loaded = 0;
 		}
 
 	}
 
-	/* perform global cleanup and exit */
-EXIT:
 	cleanup();
-
+	tst_exit();
 }
 
-/* setup() - performs all ONE TIME setup for this test */
-void setup(void)
+static void setup(void)
 {
+	tst_sig(NOFORK, DEF_HANDLER, cleanup);
 
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* Check whether we are root  */
-	if (geteuid() != 0) {
-		tst_brkm(TBROK, NULL, "Must be root for this test!");
+	tst_require_root(NULL);
 
-	}
-
-	/*
-	 * if (tst_kvercmp(2,5,48) >= 0)
-	 * tst_brkm(TCONF, NULL, "This test will not work on "
-	 *                              "kernels after 2.5.48");
-	 */
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -c option.
-	 */
 	TEST_PAUSE;
-
 }
 
-/*
- * cleanup()
- *	performs all ONE TIME cleanup for this test at
- *	completion or premature exit
- */
-void cleanup(void)
+static void cleanup(void)
 {
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
+	if (module_loaded == 1)
+		tst_module_unload(NULL, MODULE_NAME_KO);
 	TEST_CLEANUP;
-
 }
-- 
1.8.2.1


------------------------------------------------------------------------------
Android apps run on BlackBerry 10
Introducing the new BlackBerry 10.2.1 Runtime for Android apps.
Now with support for Jelly Bean, Bluetooth, Mapview and more.
Get your Android app in front of a whole new audience.  Start now.
http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

[LTP] [PATCH v2 2/4] delete_module/delete_module02.c: cleanup

[Xiaoguang Wang]

* Delete some useless commtents.
* Use SAFE_* macros.
* Some cleanup.

Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
---
 .../kernel/module/delete_module/delete_module02.c  | 242 ++++++---------------
 1 file changed, 64 insertions(+), 178 deletions(-)

diff --git a/testcases/kernel/module/delete_module/delete_module02.c b/testcases/kernel/module/delete_module/delete_module02.c
index 23b0b0a..69fa6cc 100644
--- a/testcases/kernel/module/delete_module/delete_module02.c
+++ b/testcases/kernel/module/delete_module/delete_module02.c
@@ -14,72 +14,19 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
-/**********************************************************
- *
- *    TEST IDENTIFIER   : delete_module02
- *
- *    EXECUTED BY       : root / superuser
- *
- *    TEST TITLE        : Checking error conditions for delete_module(2)
- *
- *    TEST CASE TOTAL   : 5
- *
- *    AUTHOR            : Madhu T L <madhu.tarikere@wipro.com>
- *
- *    SIGNALS
- *      Uses SIGUSR1 to pause before test if option set.
- *      (See the parse_opts(3) man page).
+
+/*
+ *    AUTHOR: Madhu T L <madhu.tarikere@wipro.com>
  *
  *    DESCRIPTION
  *      Verify that,
  *      1. delete_module(2) returns -1 and sets errno to ENOENT for nonexistent
  *	   module entry.
- *      2. delete_module(2) returns -1 and sets errno to EINVAL, if module
- *         name parameter is null terminated (zero length) string.
- *      3. delete_module(2) returns -1 and sets errno to EFAULT, if
+ *      2. delete_module(2) returns -1 and sets errno to EFAULT, if
  *         module name parameter is outside program's accessible address space.
- *      4. delete_module(2) returns -1 and sets errno to ENAMETOOLONG, if
- *         module name parameter is too long.
- *      5. delete_module(2) returns -1 and sets errno to EPERM, if effective
+ *      3. delete_module(2) returns -1 and sets errno to EPERM, if effective
  *         user id of the caller is not superuser.
- *
- *      Setup:
- *        Setup signal handling.
- *        Test caller is super user
- *        Check existances of "nobody" user id.
- *        Initialize  long module name
- *        Set expected errnos for logging
- *        Pause for SIGUSR1 if option specified.
- *		   Initialize modname for each child process
- *
- *      Test:
- *       Loop if the proper options are given.
- *		   Perform testcase specific setup (if needed)
- *        Execute system call
- *        Check return code and error number, if matching,
- *                   Issue PASS message
- *        Otherwise,
- *                   Issue FAIL message
- *		   Perform testcase specific cleanup (if needed)
- *
- *      Cleanup:
- *        Print errno log and/or timing stats if options given
- *
- * USAGE:  <for command-line>
- *  delete_module02 [-c n] [-e] [-f] [-h] [-i n] [-I x] [-p] [-P x] [-t]
- *		 		 where,  -c n : Run n copies concurrently.
- *	 		 		 -e   : Turn on errno logging.
- *	 		 		 -f   : Turn off functional testing
- *	 		 		 -h   : Show help screen
- *	 		 		 -i n : Execute test n times.
- *	 		 		 -I x : Execute test for x seconds.
- *	 		 		 -p   : Pause for SIGUSR1 before
- *	 		 		 	starting test.
- *	 		 		 -P x : Pause for x seconds between
- *	 		 		 	iterations.
- *	 		 		 -t   : Turn on syscall timing.
- *
- ****************************************************************/
+ */
 
 #include <errno.h>
 #include <pwd.h>
@@ -95,184 +42,123 @@
 #include <sys/mman.h>
 #include "test.h"
 #include "usctest.h"
+#include "safe_macros.h"
+#include "linux_syscall_numbers.h"
 
-#define NULLMODNAME ""
-#define BASEMODNAME "dummy"
-#define LONGMODNAMECHAR 'm'	/* Arbitrarily selected */
-#define EXP_RET_VAL -1
-
-/* Test case structure */
-struct test_case_t {
-	char *modname;
-	/* Expected errno. */
-	int experrno;
-	char *desc;
-	/* Individual setup routine. */
-	int (*setup) (void);
-	/* Individual cleanup routine */
-	void (*cleanup) (void);
-};
+#define NULLMODNAME	""
+#define BASEMODNAME	"dummy"
+#define LONGMODNAMECHAR	'm'	/* Arbitrarily selected */
 
 char *TCID = "delete_module02";
-static int exp_enos[] = { EPERM, EINVAL, ENOENT, EFAULT, ENAMETOOLONG, 0 };
+static int exp_enos[] = { EPERM, ENOENT, EFAULT, 0 };
 
 static char nobody_uid[] = "nobody";
 struct passwd *ltpuser;
 static char longmodname[MODULE_NAME_LEN];
-static int testno;
-/* Name of the module */
 static char modname[20];
 
-char *bad_addr = 0;
-
 static void setup(void);
 static void cleanup(void);
-static int setup1(void);
+static void setup1(void);
 static void cleanup1(void);
 
-struct test_case_t;
-
-static struct test_case_t tdat[] = {
-	{modname, ENOENT,
-	 "nonexistent module", NULL, NULL},
-	{NULLMODNAME, ENOENT,
-	 "null terminated module name", NULL, NULL},
-	{(char *)-1, EFAULT,
-	 "module name outside program's "
-	 "accessible address space", NULL, NULL},
-	{longmodname, ENOENT,
-	 "long module name", NULL, NULL},
-	{modname, EPERM,
-	 "non-superuser", setup1, cleanup1},
+static struct test_case_t {
+	char *modname;
+	int experrno;
+	char *desc;
+	void (*setup) (void);
+	void (*cleanup) (void);
+} tdat[] = {
+	{ modname, ENOENT, "nonexistent module", NULL, NULL},
+	{ NULLMODNAME, ENOENT, "null terminated module name", NULL, NULL},
+	{ (char *)-1, EFAULT, "module name outside program's "
+	  "accessible address space", NULL, NULL},
+	{ longmodname, ENOENT, "long module name", NULL, NULL},
+	{ modname, EPERM, "non-superuser", setup1, cleanup1},
 };
 
-int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]);
+int TST_TOTAL = ARRAY_SIZE(tdat);
 
 int main(int argc, char **argv)
 {
 	int lc;
+	int i;
+
 	char *msg;
 
-	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
+	msg = parse_opts(argc, argv, NULL, NULL);
+	if (msg != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
 	setup();
 
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* reset tst_count in case we are looping */
 		tst_count = 0;
 
-		for (testno = 0; testno < TST_TOTAL; ++testno) {
-			if ((tdat[testno].setup) && (tdat[testno].setup())) {
-				/* setup() failed, skip this test */
-				continue;
-			}
-			/* Test the system call */
-			TEST(delete_module(tdat[testno].modname));
+		for (i = 0; i < TST_TOTAL; ++i) {
+			if (tdat[i].setup)
+				tdat[i].setup();
+
+			tst_resm(TINFO, "test %s", tdat[i].desc);
+			TEST(ltp_syscall(__NR_delete_module,
+			     tdat[i].modname, 0));
 			TEST_ERROR_LOG(TEST_ERRNO);
-			printf("TEST_RETURN is %d, TEST_ERRNO is %d\n",
-			       TEST_RETURN, TEST_ERRNO);
-			if ((TEST_RETURN == EXP_RET_VAL) &&
-			    (TEST_ERRNO == tdat[testno].experrno)) {
-				tst_resm(TPASS, "Expected results for %s, "
-					 "errno: %d", tdat[testno].desc,
-					 TEST_ERRNO);
+
+			if (TEST_RETURN != -1) {
+				tst_resm(TFAIL, "delete_module() "
+					 "succeeded unexpectedly");
+			} else if (TEST_ERRNO == tdat[i].experrno) {
+				tst_resm(TPASS | TTERRNO,
+					 "delete_module() failed as expected");
 			} else {
-				tst_resm(TFAIL, "Unexpected results for %s ; "
-					 "returned %d (expected %d), "
-					 "errno %d (expected %d)",
-					 tdat[testno].desc,
-					 TEST_RETURN, EXP_RET_VAL,
-					 TEST_ERRNO, tdat[testno].experrno);
-			}
-			if (tdat[testno].cleanup) {
-				tdat[testno].cleanup();
+				tst_resm(TFAIL | TTERRNO, "delete_module() "
+					 "failed unexpectedly; expected: "
+					 "%d - %s", tdat[i].experrno,
+					 strerror(tdat[i].experrno));
 			}
+			if (tdat[i].cleanup)
+				tdat[i].cleanup();
 		}
 	}
+
 	cleanup();
 	tst_exit();
 }
 
-int setup1(void)
+static void setup1(void)
 {
-	/* Change effective user id to nodody */
-	if (seteuid(ltpuser->pw_uid) == -1) {
-		tst_resm(TBROK, "seteuid failed to set the effective"
-			 " uid to %d", ltpuser->pw_uid);
-		return 1;
-	}
-	return 0;
+	SAFE_SETEUID(cleanup, ltpuser->pw_uid);
 }
 
-void cleanup1(void)
+static void cleanup1(void)
 {
-	/* Change effective user id to root */
-	if (seteuid(0) == -1) {
-		tst_brkm(TBROK, NULL, "seteuid failed to set the effective"
-			 " uid to root");
-	}
+	SAFE_SETEUID(cleanup, 0);
 }
 
-/*
- * setup()
- *	performs all ONE TIME setup for this test
- */
-void setup(void)
+static void setup(void)
 {
-
 	tst_sig(NOFORK, DEF_HANDLER, cleanup);
 
-	/* Check whether it is root  */
-	if (geteuid() != 0) {
-		tst_brkm(TBROK, NULL, "Must be root for this test!");
+	tst_require_root(NULL);
 
-	}
+	ltpuser = SAFE_GETPWNAM(cleanup, nobody_uid);
 
-	/*if (tst_kvercmp(2,5,48) >= 0)
-	   tst_brkm(TCONF, NULL, "This test will not work on "
-	   "kernels after 2.5.48");
-	 */
+	TEST_EXP_ENOS(exp_enos);
 
-	/* Check for nobody_uid user id */
-	if ((ltpuser = getpwnam(nobody_uid)) == NULL) {
-		tst_brkm(TBROK, NULL, "Required user %s doesn't exists",
-			 nobody_uid);
-	}
+	TEST_PAUSE;
 
 	/* Initialize longmodname to LONGMODNAMECHAR character */
 	memset(longmodname, LONGMODNAMECHAR, MODULE_NAME_LEN - 1);
 
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -c option.
-	 */
-	TEST_PAUSE;
-
 	/* Get unique module name for each child process */
-	if (sprintf(modname, "%s_%d", BASEMODNAME, getpid()) <= 0) {
+	if (sprintf(modname, "%s_%d", BASEMODNAME, getpid()) <= 0)
 		tst_brkm(TBROK, NULL, "Failed to initialize module name");
-	}
-	bad_addr = mmap(0, 1, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
-	if (bad_addr == MAP_FAILED) {
-		tst_brkm(TBROK, cleanup, "mmap failed");
-	}
-	tdat[2].modname = bad_addr;
 
+	tdat[2].modname = SAFE_MMAP(cleanup, 0, 1, PROT_NONE,
+				    MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
 }
 
-/*
- * cleanup()
- *	performs all ONE TIME cleanup for this test at
- *	completion or premature exit
- */
 void cleanup(void)
 {
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
 	TEST_CLEANUP;
 }
-- 
1.8.2.1


------------------------------------------------------------------------------
Android apps run on BlackBerry 10
Introducing the new BlackBerry 10.2.1 Runtime for Android apps.
Now with support for Jelly Bean, Bluetooth, Mapview and more.
Get your Android app in front of a whole new audience.  Start now.
http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

[LTP] [PATCH v2 3/4] delete_module/delete_module03.c: cleanup

[Xiaoguang Wang]

* Delete some useless commtents and fix some.
* Use SAFE_* macros.
* Some cleanup.

Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
---
 .../kernel/module/delete_module/delete_module03.c  | 220 +++++++--------------
 1 file changed, 70 insertions(+), 150 deletions(-)

diff --git a/testcases/kernel/module/delete_module/delete_module03.c b/testcases/kernel/module/delete_module/delete_module03.c
index f38c03a..6a654c8 100644
--- a/testcases/kernel/module/delete_module/delete_module03.c
+++ b/testcases/kernel/module/delete_module/delete_module03.c
@@ -14,202 +14,122 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
-/**********************************************************
- *
- *    TEST IDENTIFIER   : delete_module03
- *
- *    EXECUTED BY       : root / superuser
- *
- *    TEST TITLE        : Checking error conditions for delete_module(2)
- *
- *    TEST CASE TOTAL   : 1
- *
- *    AUTHOR            : Madhu T L <madhu.tarikere@wipro.com>
- *
- *    SIGNALS
- *      Uses SIGUSR1 to pause before test if option set.
- *      (See the parse_opts(3) man page).
+
+/*
+ *    AUTHOR: Madhu T L <madhu.tarikere@wipro.com>
  *
  *    DESCRIPTION
- *      Verify that, delete_module(2) returns -1 and sets errno to EBUSY, if
- *		 tried to remove a module in-use.
- *
- *      Setup:
- *        Setup signal handling.
- *        Test caller is super user
- *        Set expected errnos for logging
- *        Pause for SIGUSR1 if option specified.
- *		   Insert loadable modules
- *
- *      Test:
- *       Loop if the proper options are given.
- *        Execute system call
- *        Check return code and error number, if matching,
- *                   Issue PASS message
- *        Otherwise,
- *                   Issue FAIL message
- *
- *      Cleanup:
- *        Print errno log and/or timing stats if options given
- *
- * USAGE:  <for command-line>
- *  delete_module03 [-c n] [-e] [-f] [-h] [-i n] [-I x] [-p] [-P x] [-t]
- *		 		 where,  -c n : Run n copies concurrently. (no
- *		 		 		effect)
- *	 		 		 -e   : Turn on errno logging.
- *	 		 		 -f   : Turn off functional testing
- *	 		 		 -h   : Show help screen
- *	 		 		 -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.
- *
- * RESTRICTIONS
- *		 -c option has no effect for this testcase, even if used allows
- *		 only one instance to run at a time.
- *
- * CHANGELOG
+ *      Verify that, delete_module(2) returns -1 and sets errno to EWOULDBLOCK,
+ *      if tried to remove a module while other modules depend on this module.
  *
- *  11/22/02 -	Added "--force" to insmod options and redirected output to
- *  		/dev/null. This was done to allow kernel mismatches, b/c it
- *  		doesn't matter in this case.
- *		Robbie Williamson <robbiew@us.ibm.com>
- *
- ****************************************************************/
+ */
 
-#include <libgen.h>
 #include <errno.h>
-#include <pwd.h>
 #include "test.h"
 #include "usctest.h"
+#include "tst_module.h"
+#include "safe_macros.h"
+#include "linux_syscall_numbers.h"
 
-#define DUMMY_MOD		 "dummy_del_mod"
-#define DUMMY_MOD_DEP		 "dummy_del_mod_dep"
-#define EXP_RET_VAL		 -1
-#define EXP_ERRNO		 EWOULDBLOCK
-/*#define EXP_ERRNO		 EBUSY */
+#define DUMMY_MOD		"dummy_del_mod"
+#define DUMMY_MOD_KO		"dummy_del_mod.ko"
+#define DUMMY_MOD_DEP		"dummy_del_mod_dep"
+#define DUMMY_MOD_DEP_KO	"dummy_del_mod_dep.ko"
+
+static int dummy_mod_loaded;
+static int dummy_mod_dep_loaded;
 
 char *TCID = "delete_module03";
-/*static int exp_enos[] = {EBUSY, 0}; */
 static int exp_enos[] = { EWOULDBLOCK, 0 };
 
 int TST_TOTAL = 1;
 
-static void setup(void);
+static void setup();
 static void cleanup(void);
 
 int main(int argc, char **argv)
 {
 	int lc;
 	char *msg;
-	char cmd[50];
 
-	if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
+	msg = parse_opts(argc, argv, NULL, NULL);
+	if (msg != NULL)
 		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
 
-	if (STD_COPIES != 1) {
-		tst_resm(TINFO, "-c option has no effect for this testcase - "
-			 "doesn't allow running more than one instance "
-			 "at a time");
-		STD_COPIES = 1;
-	}
-
-	/* Load first kernel module */
-	if (sprintf(cmd, "/sbin/insmod %s/%s.ko", dirname(argv[0]),
-		    DUMMY_MOD) <= 0) {
-		tst_resm(TBROK, "sprintf failed");
-		return 1;
-	}
-	if ((system(cmd)) != 0) {
-		tst_resm(TBROK, "Failed to load %s module", DUMMY_MOD);
-		return 1;
-	}
-
-	/* Load dependant kernel module */
-	if (sprintf(cmd, "/sbin/insmod %s/%s.ko", dirname(argv[0]),
-		    DUMMY_MOD_DEP) <= 0) {
-		tst_resm(TBROK, "sprintf failed");
-		goto END;
-	}
-	if ((system(cmd)) != 0) {
-		tst_resm(TBROK, "Failed to load %s module", DUMMY_MOD_DEP);
-		goto END;
-	}
-
 	setup();
 
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* reset tst_count in case we are looping */
 		tst_count = 0;
 
-		/* Test the system call */
-		TEST(delete_module(DUMMY_MOD));
-
-		TEST_ERROR_LOG(TEST_ERRNO);
-		if ((TEST_RETURN == (int)EXP_RET_VAL) &&
-		    (TEST_ERRNO == EXP_ERRNO)) {
-			tst_resm(TPASS, "Expected failure for module in-use, "
-				 "errno: %d", TEST_ERRNO);
+		TEST(ltp_syscall(__NR_delete_module, DUMMY_MOD, 0));
+		TEST_ERROR_LOG(errno);
+
+		if (TEST_RETURN < 0) {
+			switch (errno) {
+			case EWOULDBLOCK:
+				tst_resm(TPASS | TTERRNO,
+					 "delete_module() failed as expected");
+			break;
+			default:
+				tst_resm(TFAIL | TTERRNO, "delete_module() "
+					 "failed unexpectedly; expected: "
+					 "%d - %s", EWOULDBLOCK,
+					 strerror(EWOULDBLOCK));
+			break;
+			}
 		} else {
-			tst_resm(TFAIL, "Unexpected results for module in-use; "
-				 "returned %d (expected %d), errno %d "
-				 "(expected %d)", TEST_RETURN,
-				 EXP_RET_VAL, TEST_ERRNO, EXP_ERRNO);
+			tst_resm(TFAIL, "delete_module()"
+				 "succeeded unexpectedly");
+			dummy_mod_loaded = 0;
+			/*
+			 * insmod DUMMY_MOD_KO again in case running
+			 * with -i option
+			 */
+			tst_module_load(cleanup, DUMMY_MOD_KO, NULL);
+			dummy_mod_loaded = 1;
 		}
 	}
+
 	cleanup();
-END:
-	if (system("rmmod " DUMMY_MOD) != 0) {
-		tst_resm(TBROK, "Failed to unload %s module", DUMMY_MOD);
-		return 1;
-	}
+	tst_exit();
 
 }
 
-/*
- * setup()
- *	performs all ONE TIME setup for this test
- */
-void setup(void)
+static void setup(void)
 {
-
-	tst_sig(FORK, DEF_HANDLER, cleanup);
+	tst_sig(NOFORK, DEF_HANDLER, cleanup);
 
 	tst_require_root(NULL);
 
-	tst_tmpdir();
-
-	/* set the expected errnos... */
 	TEST_EXP_ENOS(exp_enos);
 
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -c option.
-	 */
+	/* Load first kernel module */
+	tst_module_load(cleanup, DUMMY_MOD_KO, NULL);
+	dummy_mod_loaded = 1;
+
+	/* Load dependant kernel module */
+	tst_module_load(cleanup, DUMMY_MOD_DEP_KO, NULL);
+	dummy_mod_dep_loaded = 1;
+
+	if (STD_COPIES != 1) {
+		tst_resm(TINFO, "-c option has no effect for this testcase - "
+			 "doesn't allow running more than one instance "
+			 "at a time");
+		STD_COPIES = 1;
+	}
+
 	TEST_PAUSE;
 }
 
-/*
- * cleanup()
- *	performs all ONE TIME cleanup for this test at
- *	completion or premature exit
- */
-void cleanup(void)
+static void cleanup(void)
 {
 	/* Unload dependent kernel module */
-	if (system("rmmod " DUMMY_MOD_DEP) != 0) {
-		tst_resm(TBROK, "Failed to unload %s module", DUMMY_MOD_DEP);
-	}
+	if (dummy_mod_dep_loaded == 1)
+		tst_module_unload(NULL, DUMMY_MOD_DEP_KO);
+
 	/* Unload first kernel module */
-	if (system("rmmod " DUMMY_MOD) != 0) {
-		tst_resm(TBROK, "Failed to unload %s module", DUMMY_MOD);
-	}
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
+	if (dummy_mod_loaded == 1)
+		tst_module_unload(NULL, DUMMY_MOD_KO);
+
 	TEST_CLEANUP;
-	tst_rmdir();
 }
-- 
1.8.2.1


------------------------------------------------------------------------------
Android apps run on BlackBerry 10
Introducing the new BlackBerry 10.2.1 Runtime for Android apps.
Now with support for Jelly Bean, Bluetooth, Mapview and more.
Get your Android app in front of a whole new audience.  Start now.
http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

[LTP] [PATCH v2 4/4] module/delete_module: make delete_module tests run default

[Xiaoguang Wang]

module/delete_module/Makefile: make some fixes to conform to
module compile in kernel 2.6 series and higher

testcases/kernel/Makefile: make it include module test

Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
---
 scenario_groups/default                        |  1 +
 testcases/kernel/Makefile                      |  1 +
 testcases/kernel/module/delete_module/Makefile | 35 ++++++++------------------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/scenario_groups/default b/scenario_groups/default
index 9eca8ad..ff23c7c 100644
--- a/scenario_groups/default
+++ b/scenario_groups/default
@@ -25,3 +25,4 @@ hugetlb
 commands
 hyperthreading
 kernel_misc
+modules
diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile
index fa6a191..6bffe79 100644
--- a/testcases/kernel/Makefile
+++ b/testcases/kernel/Makefile
@@ -53,6 +53,7 @@ SUBDIRS			+= connectors \
 			   security \
 			   timers \
 			   tracing \
+			   module \
 
 ifeq ($(WITH_POWER_MANAGEMENT_TESTSUITE),yes)
 SUBDIRS			+= power_management
diff --git a/testcases/kernel/module/delete_module/Makefile b/testcases/kernel/module/delete_module/Makefile
index 83b1648..95693b1 100644
--- a/testcases/kernel/module/delete_module/Makefile
+++ b/testcases/kernel/module/delete_module/Makefile
@@ -18,36 +18,23 @@
 # description		 : make file for the delete_module(2) testcases	  #
 ###########################################################################
 
-top_srcdir		?= ../../../..
-
-include $(top_srcdir)/include/mk/testcases.mk
-
-CFLAGS			+= -D_GNU_SOURCE
+ifneq ($(KERNELRELEASE),)
 
-LOCALVERSION		?= $(shell uname -r)
+obj-m := dummy_del_mod.o dummy_del_mod_dep.o
 
-MODULEDIR		:= $(DESTDIR)/lib/modules/$(LOCALVERSION)/build
+else
 
-# KBuild make variables...
-MODCFLAGS		+= $(MODULEDIR)
+top_srcdir		?= ../../../..
 
-export EXTRA_CFLAGS	:= $(CFLAGS)
-export EXTRA_CPPFLAGS	:= $(CPPFLAGS)
-export EXTRA_LDFLAGS	:= $(LDFLAGS)
+include $(top_srcdir)/include/mk/testcases.mk
 
-obj-m			:= dummy_del_mod.o dummy_del_mod_dep.o
-MODULES			:= dummy_del_mod.ko dummy_del_mod_dep.ko
+REQ_VERSION_MAJOR	:= 2
+REQ_VERSION_PATCH	:= 6
 
-# New make infra variables...
-CLEAN_TARGETS		:= .dummy* *.mod.c .tmp_version *.ko
-INSTALL_TARGETS		:= $(MODULES)
-MAKE_TARGETS		:= delete_module01 delete_module02 delete_module03
+MAKE_TARGETS		:= delete_module01 delete_module02 delete_module03 \
+			   dummy_del_mod.ko dummy_del_mod_dep.ko
 
+include $(top_srcdir)/include/mk/module.mk
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
 
-$(MAKE_TARGETS): | make-module
-
-# KBuild will gripe because we redefine CFLAGS if KBUILD_NOPEDANTIC isn't set.
-.PHONY: make-module
-make-module:
-	make -C $(MODULEDIR) KBUILD_NOPEDANTIC=1 SUBDIRS=$(abs_srcdir) modules
+endif
-- 
1.8.2.1


------------------------------------------------------------------------------
Android apps run on BlackBerry 10
Introducing the new BlackBerry 10.2.1 Runtime for Android apps.
Now with support for Jelly Bean, Bluetooth, Mapview and more.
Get your Android app in front of a whole new audience.  Start now.
http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH v2 1/4] delete_module/delete_module01.c: cleanup

[Wanlong Gao]

On 02/11/2014 04:08 PM, Xiaoguang Wang wrote:
> * Delete some useless commtents.
> * Use SAFE_* macros.
> * Some cleanup and fixes.
> 
> Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
> ---
>  .../kernel/module/delete_module/delete_module01.c  | 148 +++++----------------
>  1 file changed, 36 insertions(+), 112 deletions(-)

Applied the series, thank you.

Wanlong Gao


------------------------------------------------------------------------------
Android apps run on BlackBerry 10
Introducing the new BlackBerry 10.2.1 Runtime for Android apps.
Now with support for Jelly Bean, Bluetooth, Mapview and more.
Get your Android app in front of a whole new audience.  Start now.
http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list