diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:26:57 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:37:50 -0700 |
| commit | ccde045431d38d4828412149f067631487f8025f (patch) | |
| tree | e54c3e18a449d800f32a0cb493e6180dc66235d1 /test/suite | |
| parent | 95b17c4c4309cfee7fc0fc180dc9133195579c8b (diff) | |
| parent | 472271b153c5dc53c28beac55480a8d8434b2d5c (diff) | |
| download | android_system_bt-ccde045431d38d4828412149f067631487f8025f.tar.gz android_system_bt-ccde045431d38d4828412149f067631487f8025f.tar.bz2 android_system_bt-ccde045431d38d4828412149f067631487f8025f.zip | |
Merge tag 'android-6.0.1_r61' into HEADreplicant-6.0-0001stable/cm-13.0-ZNH5Y
Android 6.0.1 Release 61 (MOB30Z)
Change-Id: Icda48d6c36e74365e608d80f0054fc58d8febc26
Diffstat (limited to 'test/suite')
| -rw-r--r-- | test/suite/support/callbacks.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/suite/support/callbacks.h b/test/suite/support/callbacks.h index e01de39a2..2ef35156c 100644 --- a/test/suite/support/callbacks.h +++ b/test/suite/support/callbacks.h @@ -20,12 +20,14 @@ #include "base.h" +#include <errno.h> #include <semaphore.h> +#include <unistd.h> #define WAIT(callback) \ do { \ sem_t *semaphore = callbacks_get_semaphore(#callback); \ - sem_wait(semaphore); \ + TEMP_FAILURE_RETRY(sem_wait(semaphore)); \ } while (0) #define CALL_AND_WAIT(expression, callback) \ @@ -33,7 +35,7 @@ sem_t *semaphore = callbacks_get_semaphore(#callback); \ while (!sem_trywait(semaphore)); \ expression; \ - sem_wait(semaphore); \ + TEMP_FAILURE_RETRY(sem_wait(semaphore)); \ } while(0) // To be called from every exit point of the callback. This macro |