/* cunit - A little C Unit facility */
-/* Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2005-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
}
/* 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;
/* 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");
if (suite->unit_disabled) {
fprintf(stderr, "%s%d disabled", (first ? "" : ", "),
suite->unit_disabled);
- first = 0;
}
fprintf(stderr, ")\n Tests: %.0f%% ok (%d tests: ",
suite->nb_tests
if (suite->test_expect) {
fprintf(stderr, "%s%d expected to fail", (first ? "" : "; "),
suite->test_expect);
- first = 0;
}
fprintf(stderr, ")\n");
}
}
}
-int xbt_test_run(char *selection)
+int xbt_test_run(char *selection, int verbosity)
{
apply_selection(selection);
/* Run all the suites */
xbt_dynar_foreach(_xbt_test_suites, it_suite, suite)
- xbt_test_suite_run(suite);
+ xbt_test_suite_run(suite, verbosity);
/* Display some more statistics */
fprintf(stderr, "\n\n TOTAL: Suites: %.0f%% ok (%d suites: ",
if (_xbt_test_suite_ignore) {
fprintf(stderr, "%s%d ignored", (first ? "" : ", "),
_xbt_test_suite_ignore);
- first = 0;
}
fprintf(stderr, ")\n Units: %.0f%% ok (%d units: ",
_xbt_test_nb_units
if (_xbt_test_unit_ignore) {
fprintf(stderr, "%s%d ignored", (first ? "" : ", "),
_xbt_test_unit_ignore);
- first = 0;
}
fprintf(stderr, ")\n Tests: %.0f%% ok (%d tests: ",
_xbt_test_nb_tests