patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

tests: boot_page_table cleanup

Browse source 
Use ztest macro for asserts instead of plain conditionals. Cleanup style
a bit.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2018-02-16 15:11:06 -06:00 committed by Anas Nashif
parent 516ded7dff
commit 7e5853888c
3 changed files with 22 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
tests/kernel/boot_page_table/src/boot_page_table.c
View file

@ -36,7 +36,7 @@ static int check_param_nonset_region(union x86_mmu_pae_pte *value,
return status;
}
static int starting_addr_range(u32_t start_addr_range)
static void starting_addr_range(u32_t start_addr_range)
{
u32_t addr_range, status = true;
@ -44,20 +44,15 @@ static int starting_addr_range(u32_t start_addr_range)
for (addr_range = start_addr_range; addr_range <=
(start_addr_range + STARTING_ADDR_RANGE_LMT);
addr_range += 0x1000) {
addr_range += 0x1000) {
value = X86_MMU_GET_PTE(addr_range);
status &= check_param(value, REGION_PERM);
if (status == 0) {
printk("error at %d permissions %d\n",
addr_range, REGION_PERM);
TC_PRINT("%s failed\n", __func__);
return TC_FAIL;
}
zassert_false((status == 0), "error at %d permissions %d\n",
addr_range, REGION_PERM);
}
return TC_PASS;
}
static int before_start_addr_range(u32_t start_addr_range)
static void before_start_addr_range(u32_t start_addr_range)
{
u32_t addr_range, status = true;
union x86_mmu_pae_pte *value;
@ -66,44 +61,32 @@ static int before_start_addr_range(u32_t start_addr_range)
addr_range < (start_addr_range); addr_range += 0x1000) {
value = X86_MMU_GET_PTE(addr_range);
status &= check_param_nonset_region(value,
REGION_PERM);
if (status == 0) {
TC_PRINT("%s failed\n", __func__);
printk("error at %d permissions %d\n",
addr_range, REGION_PERM);
return TC_FAIL;
status &= check_param_nonset_region(value, REGION_PERM);
}
zassert_false((status == 0), "error at %d permissions %d\n",
addr_range, REGION_PERM);
}
return TC_PASS;
}
static int ending_start_addr_range(u32_t start_addr_range)
static void ending_start_addr_range(u32_t start_addr_range)
{
u32_t addr_range, status = true;
union x86_mmu_pae_pte *value;
for (addr_range = start_addr_range + ADDR_SIZE; addr_range <
(start_addr_range + ADDR_SIZE + 0x10000);
addr_range += 0x1000) {
addr_range += 0x1000) {
value = X86_MMU_GET_PTE(addr_range);
status &= check_param_nonset_region(value, REGION_PERM);
if (status == 0) {
TC_PRINT("%s failed\n", __func__);
printk("error at %d permissions %d\n",
addr_range, REGION_PERM);
return TC_FAIL;
}
zassert_false((status == 0), "error at %d permissions %d\n",
addr_range, REGION_PERM);
}
return TC_PASS;
}
int boot_page_table(void)
void test_boot_page_table(void)
{
u32_t start_addr_range;
int iterator = 0, check = 0;
int iterator = 0;
for (iterator = 0; iterator < MEMORY_REG_NUM; iterator++) {
switch (iterator) {
@ -126,21 +109,10 @@ int boot_page_table(void)
default:
break;
}
check = starting_addr_range(start_addr_range);
if (check == TC_FAIL)
return TC_FAIL;
check = before_start_addr_range(start_addr_range);
if (check == TC_FAIL)
return TC_FAIL;
check = ending_start_addr_range(start_addr_range);
if (check == TC_FAIL)
return TC_FAIL;
starting_addr_range(start_addr_range);
before_start_addr_range(start_addr_range);
ending_start_addr_range(start_addr_range);
}
return TC_PASS;
}
void test_boot_page_table(void)
{
zassert_true(boot_page_table() == TC_PASS, NULL);
}

8
tests/kernel/boot_page_table/src/boot_page_table.h
View file

@ -12,8 +12,8 @@
* Returns the Page table address for the particular address.
* Page Table address(returned value) is always 4KBytes aligned.
*/
#define X86_MMU_GET_PT_ADDR(addr) \
((struct x86_mmu_page_table *)\
#define X86_MMU_GET_PT_ADDR(addr) \
((struct x86_mmu_page_table *) \
(X86_MMU_GET_PDE(addr)->page_table << MMU_PAGE_SHIFT))
#endif
@ -23,8 +23,8 @@
* use the union to extract page entry related information.
*/
#define X86_MMU_GET_PTE(addr)\
((union x86_mmu_pae_pte *)\
#define X86_MMU_GET_PTE(addr) \
((union x86_mmu_pae_pte *) \
(&X86_MMU_GET_PT_ADDR(addr)->entry[MMU_PAGE_NUM(addr)]))
#endif

2
tests/kernel/boot_page_table/src/main.c
View file

@ -10,6 +10,6 @@ extern void test_boot_page_table(void);
void test_main(void)
{
ztest_test_suite(boot_page_table_validate,
ztest_unit_test(test_boot_page_table));
ztest_unit_test(test_boot_page_table));
ztest_run_test_suite(boot_page_table_validate);
}