Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 02:18:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix test for array size orders."

Browse Source
This commit is contained in:
Treehugger Robot
2016-11-03 22:07:24 +00:00
committed by Gerrit Code Review
parent 1f4fbc0793 1d57002951
commit 139b69077f
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/baz/1.0/IBaz.hal
View File

@@ -34,6 +34,12 @@ interface IBaz extends IBase {
blah = goober
};
typedef int32_t[3] ThreeInts;
struct T {
ThreeInts[5] matrix5x3;
int32_t[3][5] matrix3x5;
};
@Fragile @NoReally(very="yes", array={"a","b","c"})
oneway doThis(float param);

26
tests/pointer/1.0/default/Pointer.h
View File

@@ -156,20 +156,20 @@ public:
Return<void> foo20(const hidl_vec<IPointer::Sam const*>&) override {
return Void();
}
Return<void> foo21(hidl_array<IPointer::Ada, 3, 2, 1> const* a_array_ptr) override {
const hidl_array<IPointer::Ada, 3, 2, 1>& a_array = *a_array_ptr;
Return<void> foo21(hidl_array<IPointer::Ada, 1, 2, 3> const* a_array_ptr) override {
const hidl_array<IPointer::Ada, 1, 2, 3>& a_array = *a_array_ptr;
PUSH_ERROR_IF(a_array[0][0][0].s_ptr->data != 500);
for(size_t i = 0; i < 3; i++)
for(size_t i = 0; i < 1; i++)
for(size_t j = 0; j < 2; j++)
for(size_t k = 0; k < 1; k++)
for(size_t k = 0; k < 3; k++)
PUSH_ERROR_IF(a_array[i][j][k].s_ptr != a_array[0][0][0].s_ptr);
return Void();
}
Return<void> foo22(const hidl_array<IPointer::Ada const*, 3, 2, 1>& a_ptr_array) override {
Return<void> foo22(const hidl_array<IPointer::Ada const*, 1, 2, 3>& a_ptr_array) override {
PUSH_ERROR_IF(a_ptr_array[0][0][0]->s_ptr->data != 500);
for(size_t i = 0; i < 3; i++)
for(size_t i = 0; i < 1; i++)
for(size_t j = 0; j < 2; j++)
for(size_t k = 0; k < 1; k++)
for(size_t k = 0; k < 3; k++)
PUSH_ERROR_IF(a_ptr_array[i][j][k] != a_ptr_array[0][0][0]);
return Void();
}
@@ -315,19 +315,19 @@ public:
return Void();
}
Return<void> bar21(bar21_cb _cb) override {
hidl_array<IPointer::Ada, 3, 2, 1> a_array;
for(size_t i = 0; i < 3; i++)
hidl_array<IPointer::Ada, 1, 2, 3> a_array;
for(size_t i = 0; i < 1; i++)
for(size_t j = 0; j < 2; j++)
for(size_t k = 0; k < 1; k++)
for(size_t k = 0; k < 3; k++)
a_array[i][j][k] = *a;
_cb(&a_array);
return Void();
}
Return<void> bar22(bar22_cb _cb) override {
hidl_array<const IPointer::Ada *, 3, 2, 1> a_ptr_array;
for(size_t i = 0; i < 3; i++)
hidl_array<const IPointer::Ada *, 1, 2, 3> a_ptr_array;
for(size_t i = 0; i < 1; i++)
for(size_t j = 0; j < 2; j++)
for(size_t k = 0; k < 1; k++)
for(size_t k = 0; k < 3; k++)
a_ptr_array[i][j][k] = a;
_cb(a_ptr_array);
return Void();