Commit 3e18f5f1 authored by Hou Tao's avatar Hou Tao Committed by Alexei Starovoitov
Browse files

selftests/bpf: Move test_lpm_map.c to map_tests 



Move test_lpm_map.c to map_tests/ to include LPM trie test cases in
regular test_maps run. Most code remains unchanged, including the use of
assert(). Only reduce n_lookups from 64K to 512, which decreases
test_lpm_map runtime from 37s to 0.7s.

Signed-off-by: default avatarHou Tao <houtao1@huawei.com>
Link: https://lore.kernel.org/r/20241206110622.1161752-9-houtao@huaweicloud.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 6a5c63d4

tools/testing/selftests/bpf/.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ bpf-syscall* 
test_verifier

test_maps

test_lru_map

test_lpm_map

test_tag

FEATURE-DUMP.libbpf

FEATURE-DUMP.selftests

tools/testing/selftests/bpf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ CLANG_CPUV4 := 1 
endif



# Order correspond to 'make run_tests' order

TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test_progs \

TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_progs \

	test_sockmap \

	test_tcpnotify_user test_sysctl \

	test_progs-no_alu32

tools/testing/selftests/bpf/test_lpm_map.c→tools/testing/selftests/bpf/map_tests/lpm_trie_map_basic_ops.c

+3 −7
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static void test_lpm_map(int keysize) 
	n_matches = 0;

	n_matches_after_delete = 0;

	n_nodes = 1 << 8;

	n_lookups = 1 << 16;

	n_lookups = 1 << 9;



	data = alloca(keysize);

	memset(data, 0, keysize);
@@ -770,16 +770,13 @@ static void test_lpm_multi_thread(void) 
	close(map_fd);

}



int main(void)

void test_lpm_trie_map_basic_ops(void)

{

	int i;



	/* we want predictable, pseudo random tests */

	srand(0xf00ba1);



	/* Use libbpf 1.0 API mode */

	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);



	test_lpm_basic();

	test_lpm_order();
@@ -792,6 +789,5 @@ int main(void) 
	test_lpm_get_next_key();

	test_lpm_multi_thread();



	printf("test_lpm: OK\n");

	return 0;

	printf("%s: PASS\n", __func__);

}