-/* $Id$ */
-
/* cunit - A little C Unit facility */
-/* Copyright (c) 2005 Martin Quinson. All rights reserved. */
+/* Copyright (c) 2005-2014. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This is partially inspirated from the OSSP ts (Test Suite Library) */
-#include "portable.h"
+#include "src/portable.h"
-#include "xbt/sysdep.h" /* vasprintf */
+#include "xbt/sysdep.h" /* bvprintf */
#include "xbt/cunit.h"
#include "xbt/dynar.h"
static int _xbt_test_test_ignore = 0;
static int _xbt_test_test_expect = 0;
-static int _xbt_test_nb_units = 0;
+static int _xbt_test_nb_units = 0;
static int _xbt_test_unit_failed = 0;
static int _xbt_test_unit_ignore = 0;
static int _xbt_test_unit_disabled = 0;
-static int _xbt_test_nb_suites = 0;
+static int _xbt_test_nb_suites = 0;
static int _xbt_test_suite_failed = 0;
static int _xbt_test_suite_ignore = 0;
static int _xbt_test_suite_disabled = 0;
/* test suite test log */
typedef struct s_xbt_test_log {
- char *text;
- const char *file;
- int line;
+ char *text;
+ const char *file;
+ int line;
} *xbt_test_log_t;
-static void xbt_test_log_dump(xbt_test_log_t log) {
+static void xbt_test_log_dump(xbt_test_log_t log)
+{
if (log)
- fprintf(stderr," log %p(%s:%d)=%s\n",log,log->file,log->line,log->text);
+ fprintf(stderr, " log %p(%s:%d)=%s\n", log, log->file, log->line,
+ log->text);
else
- fprintf(stderr," log=NULL\n");
+ fprintf(stderr, " log=NULL\n");
}
/* test suite test check */
typedef struct s_xbt_test_test {
- char *title;
- int failed;
- int expected_failure;
- int ignored;
- const char *file;
- int line;
- xbt_dynar_t logs;
+ char *title;
+ int failed;
+ int expected_failure;
+ int ignored;
+ const char *file;
+ int line;
+ xbt_dynar_t logs;
} *xbt_test_test_t;
-static void xbt_test_test_dump(xbt_test_test_t test){
+static void xbt_test_test_dump(xbt_test_test_t test)
+{
if (test) {
xbt_test_log_t log;
unsigned int it_log;
- fprintf(stderr," test %p(%s:%d)=%s (%s)\n",
- test,test->file,test->line,test->title,
- test->failed?"failed":"not failed");
- xbt_dynar_foreach(test->logs,it_log,log)
- xbt_test_log_dump(log);
- }
- else
- fprintf(stderr," test=NULL\n");
+ fprintf(stderr, " test %p(%s:%d)=%s (%s)\n",
+ test, test->file, test->line, test->title,
+ test->failed ? "failed" : "not failed");
+ xbt_dynar_foreach(test->logs, it_log, log)
+ xbt_test_log_dump(log);
+ } else
+ fprintf(stderr, " test=NULL\n");
}
/* test suite test unit */
struct s_xbt_test_unit {
- int enabled;
- char *name;
- char *title;
+ int enabled;
+ char *name;
+ char *title;
ts_test_cb_t func;
- const char *file;
- int line;
- xbt_dynar_t tests; /* of xbt_test_test_t*/
+ const char *file;
+ int line;
+ xbt_dynar_t tests; /* of xbt_test_test_t */
int nb_tests;
- int test_failed,test_ignore,test_expect;
+ int test_failed, test_ignore, test_expect;
};
-static void xbt_test_unit_dump(xbt_test_unit_t unit) {
+static void xbt_test_unit_dump(xbt_test_unit_t unit)
+{
if (unit) {
xbt_test_test_t test;
unsigned int it_test;
- fprintf(stderr," UNIT %s: %s (%s)\n",
- unit->name,unit->title,
- (unit->enabled?"enabled":"disabled"));
+ fprintf(stderr, " UNIT %s: %s (%s)\n",
+ unit->name, unit->title,
+ (unit->enabled ? "enabled" : "disabled"));
if (unit->enabled)
- xbt_dynar_foreach(unit->tests,it_test,test)
- xbt_test_test_dump(test);
+ xbt_dynar_foreach(unit->tests, it_test, test)
+ xbt_test_test_dump(test);
} else {
- fprintf(stderr," unit=NULL\n");
+ fprintf(stderr, " unit=NULL\n");
}
}
/* test suite */
struct s_xbt_test_suite {
- int enabled;
+ int enabled;
const char *name;
- char *title;
- xbt_dynar_t units; /* of xbt_test_unit_t */
+ char *title;
+ xbt_dynar_t units; /* of xbt_test_unit_t */
- int nb_tests,nb_units;
- int test_failed,test_ignore,test_expect;
- int unit_failed,unit_ignore,unit_disabled;
+ int nb_tests, nb_units;
+ int test_failed, test_ignore, test_expect;
+ int unit_failed, unit_ignore, unit_disabled;
};
/* destroy test suite */
-static void xbt_test_suite_free(void *s) {
- xbt_test_suite_t suite = *(xbt_test_suite_t*) s;
+static void xbt_test_suite_free(void *s)
+{
+ xbt_test_suite_t suite = *(xbt_test_suite_t *) s;
if (suite == NULL)
return;
free(suite);
}
-static void xbt_test_unit_free(void *unit) {
- xbt_test_unit_t u = *(xbt_test_unit_t*)unit;
+static void xbt_test_unit_free(void *unit)
+{
+ xbt_test_unit_t u = *(xbt_test_unit_t *) unit;
/* name is static */
free(u->title);
xbt_dynar_free(&u->tests);
free(u);
}
-static void xbt_test_test_free(void *test) {
- xbt_test_test_t t = *(xbt_test_test_t*)test;
+
+static void xbt_test_test_free(void *test)
+{
+ xbt_test_test_t t = *(xbt_test_test_t *) test;
free(t->title);
xbt_dynar_free(&(t->logs));
free(t);
}
-static void xbt_test_log_free(void *log) {
- xbt_test_log_t l= *(xbt_test_log_t*) log;
+
+static void xbt_test_log_free(void *log)
+{
+ xbt_test_log_t l = *(xbt_test_log_t *) log;
free(l->text);
free(l);
}
/** @brief create test suite */
-xbt_test_suite_t xbt_test_suite_new(const char *name, const char *fmt, ...) {
- xbt_test_suite_t suite = xbt_new0(struct s_xbt_test_suite,1);
+xbt_test_suite_t xbt_test_suite_new(const char *name, const char *fmt, ...)
+{
+ xbt_test_suite_t suite = xbt_new0(struct s_xbt_test_suite, 1);
va_list ap;
- int vres;
if (!_xbt_test_suites)
- _xbt_test_suites = xbt_dynar_new(sizeof(xbt_test_suite_t),xbt_test_suite_free);
+ _xbt_test_suites =
+ xbt_dynar_new(sizeof(xbt_test_suite_t), xbt_test_suite_free);
va_start(ap, fmt);
- vres = vasprintf(&suite->title,fmt, ap);
- suite->units = xbt_dynar_new(sizeof(xbt_test_unit_t), &xbt_test_unit_free);
+ suite->title = bvprintf(fmt, ap);
+ suite->units =
+ xbt_dynar_new(sizeof(xbt_test_unit_t), &xbt_test_unit_free);
va_end(ap);
suite->name = name;
suite->enabled = 1;
- xbt_dynar_push(_xbt_test_suites,&suite);
+ xbt_dynar_push(_xbt_test_suites, &suite);
return suite;
}
/** @brief retrieve a testsuite from name, or create a new one */
-xbt_test_suite_t xbt_test_suite_by_name(const char *name,const char *fmt, ...) {
+xbt_test_suite_t xbt_test_suite_by_name(const char *name, const char *fmt,
+ ...)
+{
xbt_test_suite_t suite;
unsigned int it_suite;
char *bufname;
va_list ap;
- int vres;
if (_xbt_test_suites)
xbt_dynar_foreach(_xbt_test_suites, it_suite, suite)
- if (!strcmp(suite->name,name))
+ if (!strcmp(suite->name, name))
return suite;
va_start(ap, fmt);
- vres = vasprintf(&bufname,fmt, ap);
+ bufname = bvprintf(fmt, ap);
va_end(ap);
- suite = xbt_test_suite_new(name,bufname,NULL);
+ suite = xbt_test_suite_new(name, bufname, NULL);
free(bufname);
return suite;
}
-void xbt_test_suite_dump(xbt_test_suite_t suite) {
+void xbt_test_suite_dump(xbt_test_suite_t suite)
+{
if (suite) {
xbt_test_unit_t unit;
unsigned int it_unit;
- fprintf(stderr,"TESTSUITE %s: %s (%s)\n",
+ fprintf(stderr, "TESTSUITE %s: %s (%s)\n",
suite->name, suite->title,
- suite->enabled?"enabled":"disabled");
+ suite->enabled ? "enabled" : "disabled");
if (suite->enabled)
- xbt_dynar_foreach(suite->units,it_unit,unit)
- xbt_test_unit_dump(unit);
+ xbt_dynar_foreach(suite->units, it_unit, unit)
+ xbt_test_unit_dump(unit);
} else {
- fprintf(stderr,"TESTSUITE IS NULL!\n");
+ fprintf(stderr, "TESTSUITE IS NULL!\n");
}
}
/* add test case to test suite */
-void xbt_test_suite_push(xbt_test_suite_t suite, const char *name, ts_test_cb_t func, const char *fmt, ...) {
+void xbt_test_suite_push(xbt_test_suite_t suite, const char *name,
+ ts_test_cb_t func, const char *fmt, ...)
+{
xbt_test_unit_t unit;
va_list ap;
- int vres;
xbt_assert(suite);
xbt_assert(func);
xbt_assert(fmt);
- unit = xbt_new0(struct s_xbt_test_unit,1);
+ unit = xbt_new0(struct s_xbt_test_unit, 1);
va_start(ap, fmt);
- vres = vasprintf(&unit->title, fmt, ap);
+ unit->title = bvprintf(fmt, ap);
va_end(ap);
- unit->name = (char*)name;
+ unit->name = (char *) name;
unit->func = func;
unit->file = NULL;
unit->line = 0;
}
/* run test one suite */
-static int xbt_test_suite_run(xbt_test_suite_t suite) {
+static int xbt_test_suite_run(xbt_test_suite_t suite, int verbosity)
+{
xbt_test_unit_t unit;
xbt_test_test_t test;
xbt_test_log_t log;
const char *file;
int line;
char *cp;
- unsigned int it_unit,it_test,it_log;
+ unsigned int it_unit, it_test, it_log;
- int first=1; /* for result pretty printing */
- int vres;
+ int first = 1; /* for result pretty printing */
if (suite == NULL)
return 0;
/* suite title pretty-printing */
{
- char suite_title[80];
- int suite_len=strlen(suite->title);
+ char suite_title[81];
+ int suite_len = strlen(suite->title);
int i;
- xbt_assert2(suite_len<68,"suite title \"%s\" too long (%d should be less than 68",
- suite->title,suite_len);
+ xbt_assert(suite_len < 68,
+ "suite title \"%s\" too long (%d should be less than 68",
+ suite->title, suite_len);
- suite_title[0]=' ';
- for (i=1;i<79;i++)
- suite_title[i]='=';
- suite_title[i++]='\n';
- suite_title[79]='\0';
+ suite_title[0] = ' ';
+ for (i = 1; i < 80; i++)
+ suite_title[i] = '=';
+ suite_title[i++] = '\n';
+ suite_title[80] = '\0';
- sprintf(suite_title + 40 - (suite_len+4)/2, "[ %s ]", suite->title);
- suite_title[40 + (suite_len+5)/2] = '=';
+ sprintf(suite_title + 40 - (suite_len + 4) / 2, "[ %s ]",
+ suite->title);
+ suite_title[40 + (suite_len + 5) / 2] = '=';
if (!suite->enabled)
- sprintf(suite_title+ 70," DISABLED ");
- fprintf(stderr, "\n%s\n",suite_title);
+ snprintf(suite_title + 70, 11, " DISABLED ");
+ fprintf(stderr, "\n%s\n", suite_title);
}
if (suite->enabled) {
unit->test_expect = 0;
/* display unit title */
- vres=asprintf(&cp," Unit: %s ......................................"
- "......................................", unit->title);
+ cp = bprintf(" Unit: %s ......................................"
+ "......................................", unit->title);
cp[70] = '\0';
fprintf(stderr, "%s", cp);
free(cp);
unit->func();
/* iterate through all performed tests to determine status */
- xbt_dynar_foreach(unit->tests,it_test, test) {
+ xbt_dynar_foreach(unit->tests, it_test, test) {
if (test->ignored) {
unit->test_ignore++;
} else {
unit->nb_tests++;
- if ( test->failed && !test->expected_failure) unit->test_failed++;
- if (!test->failed && test->expected_failure) unit->test_failed++;
+ if (test->failed && !test->expected_failure)
+ unit->test_failed++;
+ if (!test->failed && test->expected_failure)
+ unit->test_failed++;
if (test->expected_failure)
unit->test_expect++;
}
/* Display whether this unit went well */
- if (unit->test_failed > 0 || unit->test_expect) {
+ if (unit->test_failed > 0 || unit->test_expect ||
+ (verbosity && unit->nb_tests > 0)) {
/* some tests failed (or were supposed to), so do detailed reporting of test case */
if (unit->test_failed > 0) {
fprintf(stderr, ".. failed\n");
} else if (unit->nb_tests) {
- fprintf(stderr, "...... ok\n"); /* successful, but show about expected */
+ fprintf(stderr, "...... ok\n"); /* successful, but show about expected */
} else {
- fprintf(stderr, ".... skip\n"); /* shouldn't happen, but I'm a bit lost with this logic */
+ fprintf(stderr, ".... skip\n"); /* shouldn't happen, but I'm a bit lost with this logic */
}
- xbt_dynar_foreach(unit->tests,it_test, test) {
+ xbt_dynar_foreach(unit->tests, it_test, test) {
file = (test->file != NULL ? test->file : unit->file);
- line = (test->line != 0 ? test->line : unit->line);
+ line = (test->line != 0 ? test->line : unit->line);
fprintf(stderr, " %s: %s [%s:%d]\n",
- (test->ignored?" SKIP":(test->expected_failure?(test->failed?"EFAIL":"EPASS"):
- (test->failed?" FAIL":" PASS"))),
- test->title, file, line);
-
- if ( (test->expected_failure && !test->failed) || (!test->expected_failure && test->failed) ) {
- xbt_dynar_foreach(test->logs,it_log,log) {
+ (test->ignored ? " SKIP"
+ : (test->expected_failure
+ ? (test->
+ failed ? "EFAIL" : "EPASS") : (test->failed ?
+ " FAIL" :
+ " PASS"))),
+ test->title, file, line);
+
+ if ((test->expected_failure && !test->failed)
+ || (!test->expected_failure && test->failed)) {
+ xbt_dynar_foreach(test->logs, it_log, log) {
file = (log->file != NULL ? log->file : file);
- line = (log->line != 0 ? log->line : line);
+ line = (log->line != 0 ? log->line : line);
fprintf(stderr, " %s:%d: %s\n",
- file, line,log->text);
+ file, line, log->text);
}
}
}
- fprintf(stderr, " Summary: %d of %d tests failed",unit->test_failed, unit->nb_tests);
+ fprintf(stderr, " Summary: %d of %d tests failed",
+ unit->test_failed, unit->nb_tests);
if (unit->test_ignore) {
- fprintf(stderr," (%d tests ignored)\n",unit->test_ignore);
+ fprintf(stderr, " (%d tests ignored)\n", unit->test_ignore);
} else {
- fprintf(stderr,"\n");
+ fprintf(stderr, "\n");
}
} else if (!unit->enabled) {
fprintf(stderr, " disabled\n"); /* no test were run */
} else if (unit->nb_tests) {
fprintf(stderr, "...... ok\n"); /* successful */
- } else {
+ } else {
fprintf(stderr, ".... skip\n"); /* no test were run */
}
/* Accumulate test counts into the suite */
- suite->nb_tests += unit->nb_tests;
- suite->test_failed += unit->test_failed;
- suite->test_ignore += unit->test_ignore;
- suite->test_expect += unit->test_expect;
+ suite->nb_tests += unit->nb_tests;
+ suite->test_failed += unit->test_failed;
+ suite->test_ignore += unit->test_ignore;
+ suite->test_expect += unit->test_expect;
- _xbt_test_nb_tests += unit->nb_tests;
- _xbt_test_test_failed += unit->test_failed;
- _xbt_test_test_ignore += unit->test_ignore;
- _xbt_test_test_expect += unit->test_expect;
+ _xbt_test_nb_tests += unit->nb_tests;
+ _xbt_test_test_failed += unit->test_failed;
+ _xbt_test_test_ignore += unit->test_ignore;
+ _xbt_test_test_expect += unit->test_expect;
/* What's the conclusion of this test anyway? */
if (unit->nb_tests) {
}
}
}
- _xbt_test_nb_units += suite->nb_units;
- _xbt_test_unit_failed += suite->unit_failed;
- _xbt_test_unit_ignore += suite->unit_ignore;
+ _xbt_test_nb_units += suite->nb_units;
+ _xbt_test_unit_failed += suite->unit_failed;
+ _xbt_test_unit_ignore += suite->unit_ignore;
_xbt_test_unit_disabled += suite->unit_disabled;
if (suite->nb_units) {
fprintf(stderr,
" =====================================================================%s\n",
- (suite->nb_units ? (suite->unit_failed ? "== FAILED":"====== OK")
- : (suite->unit_disabled ? " DISABLED":"==== SKIP")));
+ (suite->nb_units
+ ? (suite->unit_failed ? "== FAILED" : "====== OK")
+ : (suite->unit_disabled ? " DISABLED" : "==== SKIP")));
fprintf(stderr, " Summary: Units: %.0f%% ok (%d units: ",
- suite->nb_units?((1-(double)suite->unit_failed/(double)suite->nb_units)*100.0):100.0,
- suite->nb_units);
+ suite->nb_units
+ ? ((1 -
+ (double) suite->unit_failed / (double) suite->nb_units) *
+ 100.0) : 100.0, suite->nb_units);
if (suite->nb_units != suite->unit_failed) {
- fprintf(stderr, "%s%d ok",(first?"":", "),suite->nb_units - suite->unit_failed);
+ fprintf(stderr, "%s%d ok", (first ? "" : ", "),
+ suite->nb_units - suite->unit_failed);
first = 0;
}
if (suite->unit_failed) {
- fprintf(stderr, "%s%d failed",(first?"":", "),suite->unit_failed);
+ fprintf(stderr, "%s%d failed", (first ? "" : ", "),
+ suite->unit_failed);
first = 0;
}
if (suite->unit_ignore) {
- fprintf(stderr, "%s%d ignored",(first?"":", "),suite->unit_ignore);
+ fprintf(stderr, "%s%d ignored", (first ? "" : ", "),
+ suite->unit_ignore);
first = 0;
}
if (suite->unit_disabled) {
- fprintf(stderr, "%s%d disabled",(first?"":", "),suite->unit_disabled);
- first = 0;
+ fprintf(stderr, "%s%d disabled", (first ? "" : ", "),
+ suite->unit_disabled);
}
- fprintf(stderr,")\n Tests: %.0f%% ok (%d tests: ",
- suite->nb_tests?((1-(double)suite->test_failed/(double)suite->nb_tests)*100.0):100.0,
- suite->nb_tests);
+ fprintf(stderr, ")\n Tests: %.0f%% ok (%d tests: ",
+ suite->nb_tests
+ ? ((1 -
+ (double) suite->test_failed / (double) suite->nb_tests) *
+ 100.0) : 100.0, suite->nb_tests);
- first=1;
+ first = 1;
if (suite->nb_tests != suite->test_failed) {
- fprintf(stderr, "%s%d ok",(first?"":", "),suite->nb_tests - suite->test_failed);
+ fprintf(stderr, "%s%d ok", (first ? "" : ", "),
+ suite->nb_tests - suite->test_failed);
first = 0;
}
if (suite->test_failed) {
- fprintf(stderr, "%s%d failed",(first?"":", "),suite->test_failed);
+ fprintf(stderr, "%s%d failed", (first ? "" : ", "),
+ suite->test_failed);
first = 0;
}
if (suite->test_ignore) {
- fprintf(stderr, "%s%d ignored",(first?"":"; "),suite->test_ignore);
+ fprintf(stderr, "%s%d ignored", (first ? "" : "; "),
+ suite->test_ignore);
first = 0;
}
if (suite->test_expect) {
- fprintf(stderr, "%s%d expected to fail",(first?"":"; "),suite->test_expect);
- first = 0;
+ fprintf(stderr, "%s%d expected to fail", (first ? "" : "; "),
+ suite->test_expect);
}
- fprintf(stderr,")\n");
+ fprintf(stderr, ")\n");
}
return suite->unit_failed;
}
-static void apply_selection(char *selection) {
+static void apply_selection(char *selection)
+{
/* for the parsing */
- char *sel=selection;
+ char *sel = selection;
char *p;
int done = 0;
- char dir[1024]; /* the directive */
+ char dir[1024]; /* the directive */
/* iterators */
unsigned int it_suite;
xbt_test_suite_t suite;
if (!selection || selection[0] == '\0')
return;
- /*printf("Test selection: %s\n", selection);*/
+ /*printf("Test selection: %s\n", selection); */
/* First apply the selection */
while (!done) {
int enabling = 1;
- p=strchr(sel,',');
+ p = strchr(sel, ',');
if (p) {
- strncpy(dir,sel,p-sel);
- dir[p-sel]='\0';
- sel=p+1;
+ strncpy(dir, sel, p - sel);
+ dir[p - sel] = '\0';
+ sel = p + 1;
} else {
strcpy(dir, sel);
- done=1;
+ done = 1;
}
if (dir[0] == '-') {
enabling = 0;
- memmove(dir,dir+1,strlen(dir));
+ memmove(dir, dir + 1, strlen(dir));
}
if (dir[0] == '+') {
enabling = 1;
- memmove(dir,dir+1,strlen(dir));
+ memmove(dir, dir + 1, strlen(dir));
}
- p =strchr(dir,':');
+ p = strchr(dir, ':');
if (p) {
- strcpy(unitname,p+1);
- strncpy(suitename,dir,p-dir);
- suitename[p-dir]='\0';
+ strcpy(unitname, p + 1);
+ strncpy(suitename, dir, p - dir);
+ suitename[p - dir] = '\0';
} else {
- strcpy(suitename,dir);
+ strcpy(suitename, dir);
unitname[0] = '\0';
}
/*fprintf(stderr,"Seen %s (%s; suite=%s; unit=%s)\n",
- dir,enabling?"enabling":"disabling", suitename, unitname);*/
+ dir,enabling?"enabling":"disabling", suitename, unitname); */
/* Deal with the specific case of 'all' pseudo serie */
- if (!strcmp("all",suitename)) {
- if (unitname[0]!='\0') {
- fprintf(stderr,"The 'all' pseudo-suite does not accept any unit specification\n");
+ if (!strcmp("all", suitename)) {
+ if (unitname[0] != '\0') {
+ fprintf(stderr,
+ "The 'all' pseudo-suite does not accept any unit specification\n");
exit(1);
}
- xbt_dynar_foreach(_xbt_test_suites,it_suite,suite) {
- xbt_dynar_foreach(suite->units,it_unit,unit) {
+ xbt_dynar_foreach(_xbt_test_suites, it_suite, suite) {
+ xbt_dynar_foreach(suite->units, it_unit, unit) {
unit->enabled = enabling;
}
suite->enabled = enabling;
}
} else {
unsigned int it;
- for (it=0; it< xbt_dynar_length(_xbt_test_suites); it++) {
- xbt_test_suite_t thissuite=xbt_dynar_get_as(_xbt_test_suites,it,xbt_test_suite_t);
- if (!strcmp(suitename,thissuite->name)) {
+ for (it = 0; it < xbt_dynar_length(_xbt_test_suites); it++) {
+ xbt_test_suite_t thissuite =
+ xbt_dynar_get_as(_xbt_test_suites, it, xbt_test_suite_t);
+ if (!strcmp(suitename, thissuite->name)) {
/* Do not disable the whole suite when we just want to disable a child */
- if (enabling || (unitname[0]=='\0'))
+ if (enabling || (unitname[0] == '\0'))
thissuite->enabled = enabling;
- if (unitname[0]=='\0') {
- xbt_dynar_foreach(thissuite->units,it_unit,unit){
+ if (unitname[0] == '\0') {
+ xbt_dynar_foreach(thissuite->units, it_unit, unit) {
unit->enabled = enabling;
}
- } else { /* act on one child only */
+ } else { /* act on one child only */
unsigned int it2_unit;
/* search it, first (we won't reuse it for external loop which gets broken) */
- for (it2_unit=0; it2_unit< xbt_dynar_length(thissuite->units); it2_unit++) {
- xbt_test_unit_t thisunit=xbt_dynar_get_as(thissuite->units,it2_unit,xbt_test_unit_t);
- if (!strcmp(thisunit->name,unitname)) {
+ for (it2_unit = 0;
+ it2_unit < xbt_dynar_length(thissuite->units);
+ it2_unit++) {
+ xbt_test_unit_t thisunit =
+ xbt_dynar_get_as(thissuite->units, it2_unit,
+ xbt_test_unit_t);
+ if (!strcmp(thisunit->name, unitname)) {
thisunit->enabled = enabling;
break;
}
- } /* search relevant unit */
- if (it2_unit==xbt_dynar_length(thissuite->units)) {
- fprintf(stderr,"Suite '%s' has no unit of name '%s'. Cannot apply the selection\n",
- suitename,unitname);
+ } /* search relevant unit */
+ if (it2_unit == xbt_dynar_length(thissuite->units)) {
+ fprintf(stderr,
+ "Suite '%s' has no unit of name '%s'. Cannot apply the selection\n",
+ suitename, unitname);
exit(1);
}
- } /* act on childs (either all or one) */
+ } /* act on childs (either all or one) */
- break;/* found the relevant serie. We are happy */
+ break; /* found the relevant serie. We are happy */
}
- } /* search relevant series */
- if (it==xbt_dynar_length(_xbt_test_suites)) {
- fprintf(stderr,"No suite of name '%s' found. Cannot apply the selection\n",suitename);
+ } /* search relevant series */
+ if (it == xbt_dynar_length(_xbt_test_suites)) {
+ fprintf(stderr,
+ "No suite of name '%s' found. Cannot apply the selection\n",
+ suitename);
exit(1);
}
}
}
}
-void xbt_test_dump(char *selection) {
+void xbt_test_dump(char *selection)
+{
apply_selection(selection);
if (_xbt_test_suites) {
unsigned int it_suite;
xbt_test_suite_t suite;
- xbt_dynar_foreach(_xbt_test_suites,it_suite,suite)
- xbt_test_suite_dump(suite);
+ xbt_dynar_foreach(_xbt_test_suites, it_suite, suite)
+ xbt_test_suite_dump(suite);
} else {
printf(" No suite defined.");
}
}
-int xbt_test_run(char *selection) {
+int xbt_test_run(char *selection, int verbosity)
+{
apply_selection(selection);
if (_xbt_test_suites) {
unsigned int it_suite;
xbt_test_suite_t suite;
- int first=1;
+ int first = 1;
/* Run all the suites */
- xbt_dynar_foreach(_xbt_test_suites,it_suite,suite)
- xbt_test_suite_run(suite);
+ xbt_dynar_foreach(_xbt_test_suites, it_suite, suite)
+ xbt_test_suite_run(suite, verbosity);
/* Display some more statistics */
- fprintf(stderr,"\n\n TOTAL: Suites: %.0f%% ok (%d suites: ",
+ fprintf(stderr, "\n\n TOTAL: Suites: %.0f%% ok (%d suites: ",
_xbt_test_nb_suites
- ? ((1-(double)_xbt_test_suite_failed/(double)_xbt_test_nb_suites)*100.0)
- : 100.0,
- _xbt_test_nb_suites);
+ ? ((1 -
+ (double) _xbt_test_suite_failed /
+ (double) _xbt_test_nb_suites) * 100.0)
+ : 100.0, _xbt_test_nb_suites);
if (_xbt_test_nb_suites != _xbt_test_suite_failed) {
- fprintf(stderr, "%d ok",_xbt_test_nb_suites - _xbt_test_suite_failed);
+ fprintf(stderr, "%d ok",
+ _xbt_test_nb_suites - _xbt_test_suite_failed);
first = 0;
}
if (_xbt_test_suite_failed) {
- fprintf(stderr, "%s%d failed",(first?"":", "),_xbt_test_suite_failed);
+ fprintf(stderr, "%s%d failed", (first ? "" : ", "),
+ _xbt_test_suite_failed);
first = 0;
}
if (_xbt_test_suite_ignore) {
- fprintf(stderr, "%s%d ignored",(first?"":", "),_xbt_test_suite_ignore);
- first = 0;
+ fprintf(stderr, "%s%d ignored", (first ? "" : ", "),
+ _xbt_test_suite_ignore);
}
- fprintf(stderr,")\n Units: %.0f%% ok (%d units: ",
- _xbt_test_nb_units?((1-(double)_xbt_test_unit_failed/(double)_xbt_test_nb_units)*100.0):100.0,
- _xbt_test_nb_units);
- first=1;
+ fprintf(stderr, ")\n Units: %.0f%% ok (%d units: ",
+ _xbt_test_nb_units
+ ? ((1 -
+ (double) _xbt_test_unit_failed /
+ (double) _xbt_test_nb_units) * 100.0) : 100.0,
+ _xbt_test_nb_units);
+ first = 1;
if (_xbt_test_nb_units != _xbt_test_unit_failed) {
- fprintf(stderr, "%s%d ok",(first?"":", "),_xbt_test_nb_units - _xbt_test_unit_failed);
+ fprintf(stderr, "%s%d ok", (first ? "" : ", "),
+ _xbt_test_nb_units - _xbt_test_unit_failed);
first = 0;
}
if (_xbt_test_unit_failed) {
- fprintf(stderr, "%s%d failed",(first?"":", "),_xbt_test_unit_failed);
+ fprintf(stderr, "%s%d failed", (first ? "" : ", "),
+ _xbt_test_unit_failed);
first = 0;
}
if (_xbt_test_unit_ignore) {
- fprintf(stderr, "%s%d ignored",(first?"":", "),_xbt_test_unit_ignore);
- first = 0;
+ fprintf(stderr, "%s%d ignored", (first ? "" : ", "),
+ _xbt_test_unit_ignore);
}
- fprintf(stderr,")\n Tests: %.0f%% ok (%d tests: ",
- _xbt_test_nb_tests?((1-(double)_xbt_test_test_failed/(double)_xbt_test_nb_tests)*100.0):100.0,
- _xbt_test_nb_tests);
- first=1;
+ fprintf(stderr, ")\n Tests: %.0f%% ok (%d tests: ",
+ _xbt_test_nb_tests
+ ? ((1 -
+ (double) _xbt_test_test_failed /
+ (double) _xbt_test_nb_tests) * 100.0) : 100.0,
+ _xbt_test_nb_tests);
+ first = 1;
if (_xbt_test_nb_tests != _xbt_test_test_failed) {
- fprintf(stderr, "%s%d ok",(first?"":", "),_xbt_test_nb_tests - _xbt_test_test_failed);
+ fprintf(stderr, "%s%d ok", (first ? "" : ", "),
+ _xbt_test_nb_tests - _xbt_test_test_failed);
first = 0;
}
if (_xbt_test_test_failed) {
- fprintf(stderr, "%s%d failed",(first?"":", "),_xbt_test_test_failed);
+ fprintf(stderr, "%s%d failed", (first ? "" : ", "),
+ _xbt_test_test_failed);
first = 0;
}
if (_xbt_test_test_ignore) {
- fprintf(stderr, "%s%d ignored",(first?"":", "),_xbt_test_test_ignore);
+ fprintf(stderr, "%s%d ignored", (first ? "" : ", "),
+ _xbt_test_test_ignore);
first = 0;
}
if (_xbt_test_test_expect) {
- fprintf(stderr, "%s%d expected to fail",(first?"":", "),_xbt_test_test_expect);
+ fprintf(stderr, "%s%d expected to fail", (first ? "" : ", "),
+ _xbt_test_test_expect);
}
- fprintf(stderr,")\n");
+ fprintf(stderr, ")\n");
} else {
- fprintf(stderr,"No unit to run!\n");
+ fprintf(stderr, "No unit to run!\n");
_xbt_test_unit_failed++;
}
return _xbt_test_unit_failed;
}
-void xbt_test_exit(void) {
+
+void xbt_test_exit(void)
+{
xbt_dynar_free(&_xbt_test_suites);
}
/* annotate test case with test */
-void _xbt_test_add(const char*file,int line, const char *fmt, ...) {
- xbt_test_unit_t unit=_xbt_test_current_unit;
+void _xbt_test_add(const char *file, int line, const char *fmt, ...)
+{
+ xbt_test_unit_t unit = _xbt_test_current_unit;
xbt_test_test_t test;
va_list ap;
- int vres;
xbt_assert(unit);
xbt_assert(fmt);
- test = xbt_new0(struct s_xbt_test_test,1);
+ test = xbt_new0(struct s_xbt_test_test, 1);
va_start(ap, fmt);
- vres=vasprintf(&test->title, fmt, ap);
+ test->title = bvprintf(fmt, ap);
va_end(ap);
test->failed = 0;
test->expected_failure = 0;
test->ignored = 0;
test->file = file;
test->line = line;
- test->logs = xbt_dynar_new(sizeof(xbt_test_log_t),xbt_test_log_free);
- xbt_dynar_push(unit->tests,&test);
+ test->logs = xbt_dynar_new(sizeof(xbt_test_log_t), xbt_test_log_free);
+ xbt_dynar_push(unit->tests, &test);
return;
}
/* annotate test case with log message and failure */
-void _xbt_test_fail(const char*file,int line,const char *fmt, ...) {
+void _xbt_test_fail(const char *file, int line, const char *fmt, ...)
+{
xbt_test_unit_t unit = _xbt_test_current_unit;
xbt_test_test_t test;
xbt_test_log_t log;
va_list ap;
- int vres;
xbt_assert(unit);
xbt_assert(fmt);
- xbt_assert1(xbt_dynar_length(_xbt_test_current_unit->tests),
+ xbt_assert(xbt_dynar_length(_xbt_test_current_unit->tests),
"Test failed even before being declared (broken unit: %s)",
unit->title);
- log = xbt_new(struct s_xbt_test_log,1);
+ log = xbt_new(struct s_xbt_test_log, 1);
va_start(ap, fmt);
- vres=vasprintf(&log->text,fmt, ap);
+ log->text = bvprintf(fmt, ap);
va_end(ap);
log->file = file;
log->line = line;
test->failed = 1;
}
-void xbt_test_exception(xbt_ex_t e) {
- _xbt_test_fail(e.file,e.line,"Exception %s raised: %s",xbt_ex_catname(e.category),e.msg);
+void xbt_test_exception(xbt_ex_t e)
+{
+ _xbt_test_fail(e.file, e.line, "Exception %s raised: %s",
+ xbt_ex_catname(e.category), e.msg);
}
-void xbt_test_expect_failure(void) {
+void xbt_test_expect_failure(void)
+{
xbt_test_test_t test;
- xbt_assert1(xbt_dynar_length(_xbt_test_current_unit->tests),
+ xbt_assert(xbt_dynar_length(_xbt_test_current_unit->tests),
"Cannot expect the failure of a test before declaring it (broken unit: %s)",
_xbt_test_current_unit->title);
- test = xbt_dynar_getlast_as(_xbt_test_current_unit->tests,xbt_test_test_t);
+ test =
+ xbt_dynar_getlast_as(_xbt_test_current_unit->tests, xbt_test_test_t);
test->expected_failure = 1;
}
-void xbt_test_skip(void) {
+
+void xbt_test_skip(void)
+{
xbt_test_test_t test;
- xbt_assert1(xbt_dynar_length(_xbt_test_current_unit->tests),
+ xbt_assert(xbt_dynar_length(_xbt_test_current_unit->tests),
"Test skiped even before being declared (broken unit: %s)",
_xbt_test_current_unit->title);
- test = xbt_dynar_getlast_as(_xbt_test_current_unit->tests,
- xbt_test_test_t);
+ test =
+ xbt_dynar_getlast_as(_xbt_test_current_unit->tests, xbt_test_test_t);
test->ignored = 1;
}
/* annotate test case with log message only */
-void _xbt_test_log(const char*file,int line,const char *fmt, ...) {
- xbt_test_unit_t unit=_xbt_test_current_unit;
+void _xbt_test_log(const char *file, int line, const char *fmt, ...)
+{
+ xbt_test_unit_t unit = _xbt_test_current_unit;
xbt_test_test_t test;
xbt_test_log_t log;
va_list ap;
- int vres;
xbt_assert(unit);
xbt_assert(fmt);
- xbt_assert1(xbt_dynar_length(_xbt_test_current_unit->tests),
- "Test logged into even before being declared (broken test unit: %s)",unit->title);
+ xbt_assert(xbt_dynar_length(_xbt_test_current_unit->tests),
+ "Test logged into even before being declared (broken test unit: %s)",
+ unit->title);
- log = xbt_new(struct s_xbt_test_log,1);
+ log = xbt_new(struct s_xbt_test_log, 1);
va_start(ap, fmt);
- vres=vasprintf(&log->text, fmt, ap);
+ log->text = bvprintf(fmt, ap);
va_end(ap);
log->file = file;
log->line = line;
- test = xbt_dynar_getlast_as(unit->tests,xbt_test_test_t);
+ test = xbt_dynar_getlast_as(unit->tests, xbt_test_test_t);
xbt_dynar_push(test->logs, &log);
}
#ifdef SIMGRID_TEST
-XBT_TEST_SUITE("cunit","Testsuite mechanism autotest");
+XBT_TEST_SUITE("cunit", "Testsuite mechanism autotest");
-XBT_TEST_UNIT("expect",test_expected_failure,"expected failures") {
- xbt_test_add0("Skipped test");
+XBT_TEST_UNIT("expect", test_expected_failure, "expected failures")
+{
+ xbt_test_add("Skipped test");
xbt_test_skip();
- xbt_test_add2("%s %s","EXPECTED","FAILURE");
+ xbt_test_add("%s %s", "EXPECTED", "FAILURE");
xbt_test_expect_failure();
- xbt_test_log2("%s %s","Test","log");
- xbt_test_fail0("EXPECTED FAILURE");
+ xbt_test_log("%s %s", "Test", "log");
+ xbt_test_fail("EXPECTED FAILURE");
}
-#endif /* SIMGRID_TEST */
+#endif /* SIMGRID_TEST */
