pdl: Reorder canonical test files (fcb7d8c9) · Commits · e / os / android_packages_modules_Bluetooth

tools/pdl/src/bin/generate-canonical-tests.rs

+8 −8

Original line number	Diff line number	Diff line
		@@ -136,9 +136,8 @@ fn main() {
		generate_unit_tests(
		&input_path,
		&[
		"Packet_Scalar_Field",
		"Packet_Enum_Field",
		"Packet_Enum8_Field",
		"EnumChild_A",
		"EnumChild_B",
		"Packet_Array_Field_ByteElement_ConstantSize",
		"Packet_Array_Field_ByteElement_UnknownSize",
		"Packet_Array_Field_EnumElement",
		@@ -153,18 +152,19 @@ fn main() {
		"Packet_Array_Field_UnsizedElement_UnknownSize",
		"Packet_Array_Field_UnsizedElement_VariableCount",
		"Packet_Array_Field_UnsizedElement_VariableSize",
		"Packet_Size_Field",
		"Packet_Count_Field",
		"Packet_FixedScalar_Field",
		"Packet_Enum8_Field",
		"Packet_Enum_Field",
		"Packet_FixedEnum_Field",
		"Packet_Payload_Field_VariableSize",
		"Packet_FixedScalar_Field",
		"Packet_Payload_Field_UnknownSize",
		"Packet_Payload_Field_UnknownSize_Terminal",
		"Packet_Payload_Field_VariableSize",
		"Packet_Reserved_Field",
		"Packet_Scalar_Field",
		"Packet_Size_Field",
		"ScalarChild_A",
		"ScalarChild_B",
		"EnumChild_A",
		"EnumChild_B",
		],
		&module_name,
		);

tools/pdl/tests/canonical/le_rust_test_file.pdl

+49 −49

Original line number	Diff line number	Diff line
		@@ -2,6 +2,10 @@ little_endian_packets

		// Preliminary definitions

		enum MaxDiscriminantEnum : 64 {
		Max = 0xffffffffffffffff,
		}

		enum Enum7 : 7 {
		A = 1,
		B = 2,
		@@ -22,8 +26,16 @@ struct UnsizedStruct {
		array: 8[],
		}

		enum MaxDiscriminantEnum : 64 {
		Max = 0xffffffffffffffff,
		packet ScalarParent {
		a: 8,
		_size_(_payload_): 8,
		_payload_
		}

		packet EnumParent {
		a: Enum16,
		_size_(_payload_): 8,
		_payload_
		}

		// Packet bit fields
		@@ -80,6 +92,31 @@ packet Packet_FixedEnum_Field {
		b: 57,
		}

		// Packet payload fields

		// The parser must be able to handle sized payload fields without
		// size modifier.
		packet Packet_Payload_Field_VariableSize {
		_size_(_payload_): 3,
		_reserved_: 5,
		_payload_
		}

		// The parser must be able to handle payload fields of unkonwn size followed
		// by fields of statically known size. The remaining span is integrated
		// in the packet.
		packet Packet_Payload_Field_UnknownSize {
		_payload_,
		a: 16,
		}

		// The parser must be able to handle payload fields of unkonwn size.
		// The remaining span is integrated in the packet.
		packet Packet_Payload_Field_UnknownSize_Terminal {
		a: 16,
		_payload_,
		}

		packet Packet_Array_Field_ByteElement_ConstantSize {
		array: 8[4],
		}
		@@ -132,32 +169,6 @@ packet Packet_Array_Field_UnsizedElement_UnknownSize {
		array: UnsizedStruct[],
		}

		// The parser must be able to handle bit fields with fixed scalar values
		// up to 64 bits wide. The parser should generate a static size guard.
		struct Struct_FixedScalar_Field_ {
		_fixed_ = 7 : 7,
		b: 57,
		}

		// The parser must be able to handle bit fields with fixed enum values
		// up to 64 bits wide. The parser should generate a static size guard.
		struct Struct_FixedEnum_Field_ {
		_fixed_ = A : Enum7,
		b: 57,
		}

		packet ScalarParent {
		a: 8,
		_size_(_payload_): 8,
		_payload_
		}

		packet EnumParent {
		a: Enum16,
		_size_(_payload_): 8,
		_payload_
		}

		// Packet inheritance

		// The parser must handle specialization into
		@@ -184,27 +195,16 @@ packet EnumChild_B : EnumParent (a = B) {
		c: 16,
		}

		// Packet payload fields

		// The parser must be able to handle sized payload fields without
		// size modifier.
		packet Packet_Payload_Field_VariableSize {
		_size_(_payload_): 3,
		_reserved_: 5,
		_payload_
		}

		// The parser must be able to handle payload fields of unkonwn size followed
		// by fields of statically known size. The remaining span is integrated
		// in the packet.
		packet Packet_Payload_Field_UnknownSize {
		_payload_,
		a: 16,
		// The parser must be able to handle bit fields with fixed scalar values
		// up to 64 bits wide. The parser should generate a static size guard.
		struct Struct_FixedScalar_Field_ {
		_fixed_ = 7 : 7,
		b: 57,
		}

		// The parser must be able to handle payload fields of unkonwn size.
		// The remaining span is integrated in the packet.
		packet Packet_Payload_Field_UnknownSize_Terminal {
		a: 16,
		_payload_,
		// The parser must be able to handle bit fields with fixed enum values
		// up to 64 bits wide. The parser should generate a static size guard.
		struct Struct_FixedEnum_Field_ {
		_fixed_ = A : Enum7,
		b: 57,
		}