summaryrefslogtreecommitdiff
path: root/unittest
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-03-13 13:29:44 +0100
committerSergei Golubchik <sergii@pisem.net>2012-03-13 13:29:44 +0100
commit262a2ab59d5bf3974efc3758555919576b9bb2bf (patch)
treedd6140282d19660216ed2ef3f38e3bcd615166ef /unittest
parentd32b537edf30a845f74327523844dd6fe551ac8e (diff)
downloadmariadb-git-262a2ab59d5bf3974efc3758555919576b9bb2bf.tar.gz
monty's cleanup of my_thr_init.c
and collateral changes
Diffstat (limited to 'unittest')
-rw-r--r--unittest/mysys/base64-t.c5
-rw-r--r--unittest/mysys/bitmap-t.c5
-rw-r--r--unittest/mysys/my_malloc-t.c5
3 files changed, 9 insertions, 6 deletions
diff --git a/unittest/mysys/base64-t.c b/unittest/mysys/base64-t.c
index d610ad52b79..a8a5d166a1a 100644
--- a/unittest/mysys/base64-t.c
+++ b/unittest/mysys/base64-t.c
@@ -24,11 +24,11 @@
#define BASE64_ROWS 4 /* Number of ok(..) */
int
-main(void)
+main(int argc,char *argv[])
{
int i, cmp;
size_t j, k, l, dst_len, needed_length;
- MY_INIT("base64-t");
+ MY_INIT(argv[0]);
plan(BASE64_LOOP_COUNT * BASE64_ROWS);
@@ -92,5 +92,6 @@ main(void)
(uint) src_len, (uint) dst_len);
}
}
+ my_end(0);
return exit_status();
}
diff --git a/unittest/mysys/bitmap-t.c b/unittest/mysys/bitmap-t.c
index 4a26b570136..062a0963e76 100644
--- a/unittest/mysys/bitmap-t.c
+++ b/unittest/mysys/bitmap-t.c
@@ -519,12 +519,12 @@ error:
return TRUE;
}
-int main()
+int main(int argc,char *argv[])
{
int i;
int const min_size = 1;
int const max_size = MAX_TESTED_BITMAP_SIZE;
- MY_INIT("bitmap-t");
+ MY_INIT(argv[0]);
plan((max_size - min_size)/7+1);
@@ -535,5 +535,6 @@ int main()
*/
for (i= min_size; i < max_size; i+=7)
ok(do_test(i) == 0, "bitmap size %d", i);
+ my_end(0);
return exit_status();
}
diff --git a/unittest/mysys/my_malloc-t.c b/unittest/mysys/my_malloc-t.c
index 00cac0d21b7..40d9492b039 100644
--- a/unittest/mysys/my_malloc-t.c
+++ b/unittest/mysys/my_malloc-t.c
@@ -17,10 +17,10 @@
#include <my_sys.h>
#include "tap.h"
-int main(void)
+int main(int argc,char *argv[])
{
void *p;
- MY_INIT("my_malloc-t");
+ MY_INIT(argv[0]);
plan(4);
@@ -38,6 +38,7 @@ int main(void)
ok((my_free(p), 1), "Free NULL pointer.");
+ my_end(0);
return exit_status();
}