ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "trusty: tipc_test: Read output and test result from ta2ta_ipc_test"

Browse source
This commit is contained in:
Arve Hjønnevåg 2018-07-26 00:17:54 +00:00 • committed by Gerrit Code Review
commit 7b7e416649
1 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
trusty/libtrusty/tipc-test/tipc_test.c
View file

@ -587,8 +587,15 @@ static int blocked_read_test(uint repeat)
static int ta2ta_ipc_test(void) static int ta2ta_ipc_test(void)
{ {
enum test_message_header {
TEST_PASSED = 0,
TEST_FAILED = 1,
TEST_MESSAGE = 2,
};
int fd; int fd;
char rx_buf[64]; int ret;
unsigned char rx_buf[256];
if (!opt_silent) { if (!opt_silent) {
printf("%s:\n", __func__); printf("%s:\n", __func__);
@ -601,12 +608,31 @@ static int ta2ta_ipc_test(void)
return fd; return fd;
} }
/* wait for test to complete */ /* Wait for tests to complete and read status */
(void) read(fd, rx_buf, sizeof(rx_buf)); while (true) {
ret = read(fd, rx_buf, sizeof(rx_buf));
if (ret <= 0 || ret >= (int)sizeof(rx_buf)) {
fprintf(stderr, "%s: Read failed: %d\n", __func__, ret);
tipc_close(fd);
return -1;
}
if (rx_buf[0] == TEST_PASSED) {
break;
} else if (rx_buf[0] == TEST_FAILED) {
break;
} else if (rx_buf[0] == TEST_MESSAGE) {
write(STDOUT_FILENO, rx_buf + 1, ret - 1);
} else {
fprintf(stderr, "%s: Bad message header: %d\n",
__func__, rx_buf[0]);
break;
}
}
tipc_close(fd); tipc_close(fd);
return 0; return rx_buf[0] == TEST_PASSED ? 0 : -1;
} }
typedef struct uuid typedef struct uuid