Merge pull request #4533 from gilles-peskine-arm/host_test-int32-2.x

Backport 2.x: Fix build error in host_test.function when int32_t is not int
This commit is contained in:
Ronald Cron 2021-05-21 16:02:11 +02:00 committed by GitHub
commit aede2d0c52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions

View file

@ -0,0 +1,3 @@
Bugfix
* Fix test suite code on platforms where int32_t is not int, such as
Arm Cortex-M. Fixes #4530.

View file

@ -33,7 +33,7 @@ int verify_string( char **str )
* *
* \return 0 if success else 1 * \return 0 if success else 1
*/ */
int verify_int( char *str, int *value ) int verify_int( char *str, int32_t *value )
{ {
size_t i; size_t i;
int minus = 0; int minus = 0;
@ -238,7 +238,7 @@ static int parse_arguments( char *buf, size_t len, char **params,
* *
* \return 0 for success else 1 * \return 0 for success else 1
*/ */
static int convert_params( size_t cnt , char ** params , int * int_params_store ) static int convert_params( size_t cnt , char ** params , int32_t * int_params_store )
{ {
char ** cur = params; char ** cur = params;
char ** out = params; char ** out = params;
@ -520,7 +520,7 @@ int execute_tests( int argc , const char ** argv )
char buf[5000]; char buf[5000];
char *params[50]; char *params[50];
/* Store for proccessed integer params. */ /* Store for proccessed integer params. */
int int_params[50]; int32_t int_params[50];
void *pointer; void *pointer;
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
int stdout_fd = -1; int stdout_fd = -1;