Auto mount the temporary directory for testing: 1. auto mount can reduce bugs 2. add a option to change the default hugepages to be allocated
Signed-off-by: Wanlong Gao <[email protected]> --- runtest/hugetlb | 2 +- testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c | 49 +++++++++++-------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/runtest/hugetlb b/runtest/hugetlb index 751636f..bde2a0b 100644 --- a/runtest/hugetlb +++ b/runtest/hugetlb @@ -1,7 +1,7 @@ hugemmap01 hugemmap01 hugemmap02 hugemmap02 -c10 hugemmap03 hugemmap03 -I2 -c10 -hugemmap04 hugemmap04 -H/tmp +hugemmap04 hugemmap04 hugemmap05 hugemmap05 hugemmap05_1 hugemmap05 -m hugemmap05_2 hugemmap05 -s diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c index c2d7def..2960f8b 100644 --- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c +++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c @@ -58,12 +58,14 @@ #include <sys/stat.h> #include <sys/mman.h> #include <sys/types.h> +#include <sys/mount.h> #include "test.h" #include "usctest.h" #include "system_specific_hugepages_info.h" +#include "../../include/mem.h" -static char *TEMPFILE = "mmapfile"; +static char TEMPFILE[MAXPATHLEN]; char *TCID = "hugemmap04"; int TST_TOTAL = 1; @@ -74,10 +76,10 @@ static int freepages; static int beforetest; static int aftertest; static int hugepagesmapped; +static long hugepages = 1024; static char *Hopt; +static char *nr_opt; -static void setup(void); -static void cleanup(void); static void help(void); int main(int ac, char **av) @@ -85,21 +87,26 @@ int main(int ac, char **av) int lc; char *msg; int Hflag = 0; + int sflag = 0; int huge_pagesize = 0; option_t options[] = { - { "H:", &Hflag, &Hopt }, + { "H:", &Hflag, &Hopt }, + { "s:", &sflag, &nr_opt }, { NULL, NULL, NULL } }; msg = parse_opts(ac, av, options, &help); - if (msg != NULL) + if (msg) tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s," " use -help", msg); - if (!Hflag) - tst_brkm(TBROK, NULL, "-H option is REQUIRED for this test," - " use -h for options help"); + if (!Hflag) { + tst_tmpdir(); + Hopt = get_tst_tmpdir(); + } + if (sflag) + hugepages = strtol(nr_opt, NULL, 10); /* Check number of hugepages */ if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0) @@ -137,7 +144,7 @@ int main(int ac, char **av) MAP_SHARED, fildes, 0); sleep(2); if (addr == MAP_FAILED) { - tst_resm(TFAIL|TERRNO, "mmap() Failed on %s, TEMPFILE"); + tst_resm(TFAIL|TERRNO, "mmap() Failed on %s", TEMPFILE); continue; } else { tst_resm(TPASS, "Succeeded mapping file using %d pages", @@ -169,26 +176,26 @@ int main(int ac, char **av) tst_exit(); } -static void setup(void) +void setup(void) { - char mypid[40]; - - sprintf(mypid, "/%d", getpid()); - TEMPFILE = strcat(mypid, TEMPFILE); - TEMPFILE = strcat(Hopt, TEMPFILE); - - tst_sig(FORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; - + tst_require_root(NULL); + if (mount("none", Hopt, "hugetlbfs", 0, NULL) < 0) + tst_brkm(TBROK|TERRNO, NULL, + "mount failed on %s", Hopt); + + set_sys_tune("nr_hugepages", hugepages, 1); + snprintf(TEMPFILE, sizeof(TEMPFILE), "%s/mmapfile%d", + Hopt, getpid()); } -static void cleanup(void) +void cleanup(void) { TEST_CLEANUP; unlink(TEMPFILE); + umount(Hopt); + tst_rmdir(); } static void help(void) -- 1.7.9 ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
