Commit 7e3cbd34 authored by Yucong Sun's avatar Yucong Sun Committed by Andrii Nakryiko
Browse files

selftests/bpf: Fix btf_dump test under new clang 

New clang version changed ([0]) type name in dwarf from "long int" to "long",
this is causing btf_dump tests to fail.

  [0] https://github.com/llvm/llvm-project/commit/f6a561c4d6754b13165a49990e8365d819f64c86



Signed-off-by: default avatarYucong Sun <sunyucong@gmail.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211008173139.1457407-1-fallentree@fb.com
parent dd65acf7

tools/testing/selftests/bpf/progs/btf_dump_test_case_bitfields.c

+5 −5
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
/*

 *struct bitfields_only_mixed_types {

 *	int a: 3;

 *	long int b: 2;

 *	long b: 2;

 *	_Bool c: 1;

 *	enum {

 *		A = 0,
@@ -27,7 +27,7 @@ 


struct bitfields_only_mixed_types {

	int a: 3;

	long int b: 2;

	long b: 2;

	bool c: 1; /* it's really a _Bool type */

	enum {

		A, /* A = 0, dumper is very explicit */
@@ -44,8 +44,8 @@ struct bitfields_only_mixed_types { 
 *	char: 4;

 *	int a: 4;

 *	short b;

 *	long int c;

 *	long int d: 8;

 *	long c;

 *	long d: 8;

 *	int e;

 *	int f;

 *};
@@ -71,7 +71,7 @@ struct bitfield_mixed_with_others { 
 *struct bitfield_flushed {

 *	int a: 4;

 *	long: 60;

 *	long int b: 16;

 *	long b: 16;

 *};

 *

 */

tools/testing/selftests/bpf/progs/btf_dump_test_case_packing.c

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ struct non_packed_fields { 
struct nested_packed {

	char: 4;

	int a: 4;

	long int b;

	long b;

	struct {

		char c;

		int d;
@@ -44,7 +44,7 @@ union union_is_never_packed { 


union union_does_not_need_packing {

	struct {

		long int a;

		long a;

		int b;

	} __attribute__((packed));

	int c;

tools/testing/selftests/bpf/progs/btf_dump_test_case_padding.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
/* ----- START-EXPECTED-OUTPUT ----- */

struct padded_implicitly {

	int a;

	long int b;

	long b;

	char c;

};

tools/testing/selftests/bpf/progs/btf_dump_test_case_syntax.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ struct struct_with_embedded_stuff { 
			const char *d;

		} e;

		union {

			volatile long int f;

			volatile long f;

			void * restrict g;

		};

	};