static void xbt_test_test_dump(xbt_test_test_t test){
if (test) {
xbt_test_log_t log;
- int it_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");
static void xbt_test_unit_dump(xbt_test_unit_t unit) {
if (unit) {
xbt_test_test_t test;
- int it_test;
+ unsigned int it_test;
fprintf(stderr," UNIT %s: %s (%s)\n",
unit->name,unit->title,
(unit->enabled?"enabled":"disabled"));
/** @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 suite;
- int it_suite;
+ unsigned int it_suite;
char *bufname;
va_list ap;
void xbt_test_suite_dump(xbt_test_suite_t suite) {
if (suite) {
xbt_test_unit_t unit;
- int it_unit;
+ unsigned int it_unit;
fprintf(stderr,"TESTSUITE %s: %s (%s)\n",
suite->name, suite->title,
suite->enabled?"enabled":"disabled");
const char *file;
int line;
char *cp;
- int it_unit,it_test,it_log;
+ unsigned int it_unit,it_test,it_log;
int first=1; /* for result pretty printing */
suite_title[40 + (suite_len+5)/2] = '=';
if (!suite->enabled)
sprintf(suite_title+ 70," DISABLED ");
- fprintf(stderr, "\n%s",suite_title);
+ fprintf(stderr, "\n%s\n",suite_title);
}
if (suite->enabled) {
(test->failed?" FAIL":" PASS"))),
test->title, file, line);
- xbt_dynar_foreach(test->logs,it_log,log) {
- file = (log->file != NULL ? log->file : file);
- line = (log->line != 0 ? log->line : line);
- fprintf(stderr, " %s:%d: %s\n",
- file, line,log->text);
-
+ 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);
+ fprintf(stderr, " %s:%d: %s\n",
+ file, line,log->text);
+
+ }
}
}
fprintf(stderr, " Summary: %d of %d tests failed",unit->test_failed, unit->nb_tests);
int done = 0;
char dir[1024]; /* the directive */
/* iterators */
- int it_suite;
+ unsigned int it_suite;
xbt_test_suite_t suite;
xbt_test_unit_t unit;
- int it_unit;
+ unsigned int it_unit;
char suitename[512];
char unitname[512];
suite->enabled = enabling;
}
} else {
- int it;
- for (it=0; it< (int)xbt_dynar_length(_xbt_test_suites); it++) {
+ 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)) {
/* Do not disable the whole suite when we just want to disable a child */
unit->enabled = enabling;
}
} else { /* act on one child only */
- int it2_unit;
+ unsigned int it2_unit;
/* search it, first (we won't reuse it for external loop which gets broken) */
- for (it2_unit=0; it2_unit< (int)xbt_dynar_length(thissuite->units); it2_unit++) {
+ 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;
apply_selection(selection);
if (_xbt_test_suites) {
- int it_suite;
+ unsigned int it_suite;
xbt_test_suite_t suite;
xbt_dynar_foreach(_xbt_test_suites,it_suite,suite)
apply_selection(selection);
if (_xbt_test_suites) {
- int it_suite;
+ unsigned int it_suite;
xbt_test_suite_t suite;
int first=1;