diff options
| author | Li Wang <liwang@redhat.com> | 2022-02-09 16:57:00 +0800 |
|---|---|---|
| committer | Li Wang <liwang@redhat.com> | 2022-02-10 17:26:03 +0800 |
| commit | 492905565c743c4c81e1db02e60212b05f0d51f5 (patch) | |
| tree | 71e841d5bc2dc001faaca426eb0781ae5b7fda44 /testcases/kernel/mem | |
| parent | 1093e618bd7dc1f28e6e736dba0fca3764975f4d (diff) | |
| download | ltp-492905565c743c4c81e1db02e60212b05f0d51f5.tar.gz | |
kernel: make use of .min_mem_avail
Set the minimum size of MemAvailable for tests.
Signed-off-by: Li Wang <liwang@redhat.com>
Reviewed-by: Yang Xu <xuyang2018.jy@fujitsu.com>
Diffstat (limited to 'testcases/kernel/mem')
| -rw-r--r-- | testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c | 7 | ||||
| -rw-r--r-- | testcases/kernel/mem/swapping/swapping01.c | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c index b76da93a1..128671051 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c +++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c @@ -81,20 +81,16 @@ static void shared_hugepage(void) static void setup(void) { - long mem_total, hpage_size, orig_hugepages; + long hpage_size, orig_hugepages; if (tst_hugepages == 0) tst_brk(TCONF, "Not enough hugepages for testing."); orig_hugepages = get_sys_tune("nr_hugepages"); - mem_total = SAFE_READ_MEMINFO("MemTotal:"); SAFE_FILE_SCANF(PATH_SHMMAX, "%ld", &orig_shmmax); SAFE_FILE_PRINTF(PATH_SHMMAX, "%ld", (long)SIZE); SAFE_FILE_SCANF(PATH_SHMMAX, "%ld", &new_shmmax); - if (mem_total < 2L*1024*1024) - tst_brk(TCONF, "Needed > 2GB RAM, have: %ld", mem_total); - if (new_shmmax < SIZE) tst_brk(TCONF, "shmmax too low, have: %ld", new_shmmax); @@ -122,6 +118,7 @@ static struct tst_test test = { .needs_tmpdir = 1, .tcnt = 3, .test = test_hugeshmat, + .min_mem_avail = 2048, .setup = setup, .cleanup = cleanup, .request_hugepages = 1, diff --git a/testcases/kernel/mem/swapping/swapping01.c b/testcases/kernel/mem/swapping/swapping01.c index 6db0f9866..1a494bf69 100644 --- a/testcases/kernel/mem/swapping/swapping01.c +++ b/testcases/kernel/mem/swapping/swapping01.c @@ -95,10 +95,6 @@ static void init_meminfo(void) mem_over = mem_available_init * COE_SLIGHT_OVER; mem_over_max = mem_available_init * COE_DELTA; - /* at least 10MB available physical memory needed */ - if (mem_available_init < 10240) - tst_brk(TCONF, "Not enough available mem to test."); - if (swap_free_init < mem_over_max) tst_brk(TCONF, "Not enough swap space to test: swap_free_init(%ldkB) < mem_over_max(%ldkB)", swap_free_init, mem_over_max); @@ -162,6 +158,7 @@ static void check_swapping(void) static struct tst_test test = { .needs_root = 1, .forks_child = 1, + .min_mem_avail = 10, .test_all = test_swapping, .tags = (const struct tst_tag[]) { {"linux-git", "50a15981a1fa"}, |