Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update meta files to work on new gcc and perl #950

Merged
merged 1 commit into from
May 2, 2019
Merged

Update meta files to work on new gcc and perl #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion meta/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ xml: $(DEPS) Doxyfile $(CONSTHEADERS)
EXTRA = acronyms.txt aspell.en.pws *.pm *.cap

saimetadatatest.c saimetadata.c saimetadata.h: xml $(XMLDEPS) parse.pl $(CONSTHEADERS) $(EXTRA)
perl parse.pl
perl -I. parse.pl

HEADERS = saimetadata.h $(CONSTHEADERS)

Expand Down
2 changes: 2 additions & 0 deletions meta/saisanitycheck.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,8 @@ void check_attr_default_required(
break;
}

META_MD_ASSERT_FAIL(md, "default value on chardata const");

case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_OBJECT_LIST:
case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_OBJECT_LIST:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST:
Expand Down
8 changes: 4 additions & 4 deletions meta/saiserializetest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,14 +757,14 @@ void test_deserialize_ip_prefix()
uint16_t ip6[] = { 0x1111, 0x2222, 0x3303, 0x4444, 0x5555, 0x6666, 0xaaaa, 0xbbbb };
uint16_t mask[16];

memset(mask, 0xff, 16);
memset(mask, 0xff, sizeof(mask));
res = sai_deserialize_ip_prefix("1111:2222:333:4444:5555:6666:aaaa:bbbb/128", &prefix);
ASSERT_TRUE(prefix.addr_family == SAI_IP_ADDR_FAMILY_IPV6, "expected true");
ASSERT_TRUE(memcmp(prefix.addr.ip6, ip6, 16) == 0, "expected true");
ASSERT_TRUE(memcmp(prefix.mask.ip6, mask, 16) == 0, "expected true");
ASSERT_TRUE(res == (int)strlen("1111:2222:333:4444:5555:6666:aaaa:bbbb/128"), "expected true: %d", res);

memset(mask, 0, 16);
memset(mask, 0, sizeof(mask));
memset(mask, 0xff, 8);
((uint8_t*)mask)[8] = 0x80;

Expand All @@ -777,7 +777,7 @@ void test_deserialize_ip_prefix()
ASSERT_TRUE(memcmp(prefix.addr.ip6, ip6a, 16) == 0, "expected true");
ASSERT_TRUE(memcmp(prefix.mask.ip6, mask, 16) == 0, "expected true");

memset(mask, 0, 16);
memset(mask, 0, sizeof(mask));
res = sai_deserialize_ip_prefix("1::ff/0", &prefix);
ASSERT_TRUE(prefix.addr_family == SAI_IP_ADDR_FAMILY_IPV6, "expected true");
ASSERT_TRUE(res == (int)strlen("1::ff/0"), "expected true");
Expand All @@ -787,7 +787,7 @@ void test_deserialize_ip_prefix()

uint16_t ip6b[] = { 0, 0, 0, 0, 0, 0, 0, 0x100 };

memset(mask, 0xff, 16);
memset(mask, 0xff, sizeof(mask));
res = sai_deserialize_ip_prefix("::1/128", &prefix);
ASSERT_TRUE(prefix.addr_family == SAI_IP_ADDR_FAMILY_IPV6, "expected true");
ASSERT_TRUE(res == (int)strlen("::1/128"), "expected true");
Expand Down
2 changes: 1 addition & 1 deletion meta/test.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ sub CreateApiNameTest
}

WriteTest " {";
WriteTest " sai_${api}_api_t ${api}_api;";
WriteTest " sai_${api}_api_t ${api}_api = { 0 };";

if (defined $main::NON_OBJECT_ID_STRUCTS{$ot})
{
Expand Down