Test fixes:

Fixed warning (int/size_t) Fixed error message
mariadb-corporation · Jan 24, 2022 · 8aa0ffd · 8aa0ffd
1 parent 3812207
commit 8aa0ffd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c
@@ -881,7 +881,7 @@ static int test_get_options(MYSQL *unused __attribute__((unused)))
   const char *attr_val[] = {"bar1", "bar2", "bar3"};
   char **key, **val;
 
-  for (i=0; i < sizeof(options_int)/sizeof(int); i++)
+  for (i=0; i < (int)(sizeof(options_int)/sizeof(int)); i++)
   {
     mysql_options(mysql, options_int[i], &intval[0]);
     intval[1]= 0;

diff --git a/unittest/libmariadb/ps_bugs.c b/unittest/libmariadb/ps_bugs.c
@@ -5001,9 +5001,11 @@ static int test_conc_fraction(MYSQL *mysql)
 
     expected= i > 6 ? 123456 : frac * (unsigned int)powl(10, (6 - i));
 
-    diag("tm.second_part=%ld expected=%ld", tm.second_part, expected);
-    FAIL_IF(tm.second_part != expected, "expected fractional part to be 900000");
-
+    if (tm.second_part != expected)
+    {
+      diag("Error: tm.second_part=%ld expected=%ld", tm.second_part, expected);
+      return FAIL;
+    }
   }
   mysql_stmt_close(stmt);
   return OK;