A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement reentrant mutexes in xbt_os_thread
[simgrid.git]
/
src
/
xbt
/
cunit.c
diff --git
a/src/xbt/cunit.c
b/src/xbt/cunit.c
index
8efe254
..
4436ae5
100644
(file)
--- a/
src/xbt/cunit.c
+++ b/
src/xbt/cunit.c
@@
-267,7
+267,7
@@
static int xbt_test_suite_run(xbt_test_suite_t suite)
int suite_len = strlen(suite->title);
int i;
int suite_len = strlen(suite->title);
int i;
- xbt_assert
2
(suite_len < 68,
+ xbt_assert(suite_len < 68,
"suite title \"%s\" too long (%d should be less than 68",
suite->title, suite_len);
"suite title \"%s\" too long (%d should be less than 68",
suite->title, suite_len);
@@
-745,7
+745,7
@@
void _xbt_test_fail(const char *file, int line, const char *fmt, ...)
xbt_assert(unit);
xbt_assert(fmt);
xbt_assert(unit);
xbt_assert(fmt);
- xbt_assert
1
(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);
"Test failed even before being declared (broken unit: %s)",
unit->title);
@@
-771,7
+771,7
@@
void xbt_test_exception(xbt_ex_t e)
void xbt_test_expect_failure(void)
{
xbt_test_test_t test;
void xbt_test_expect_failure(void)
{
xbt_test_test_t test;
- xbt_assert
1
(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 =
"Cannot expect the failure of a test before declaring it (broken unit: %s)",
_xbt_test_current_unit->title);
test =
@@
-783,7
+783,7
@@
void xbt_test_skip(void)
{
xbt_test_test_t test;
{
xbt_test_test_t test;
- xbt_assert
1
(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 skiped even before being declared (broken unit: %s)",
_xbt_test_current_unit->title);
@@
-803,7
+803,7
@@
void _xbt_test_log(const char *file, int line, const char *fmt, ...)
xbt_assert(unit);
xbt_assert(fmt);
xbt_assert(unit);
xbt_assert(fmt);
- xbt_assert
1
(xbt_dynar_length(_xbt_test_current_unit->tests),
+ xbt_assert(xbt_dynar_length(_xbt_test_current_unit->tests),
"Test logged into even before being declared (broken test unit: %s)",
unit->title);
"Test logged into even before being declared (broken test unit: %s)",
unit->title);
@@
-827,13
+827,13
@@
XBT_TEST_SUITE("cunit", "Testsuite mechanism autotest");
XBT_TEST_UNIT("expect", test_expected_failure, "expected failures")
{
XBT_TEST_UNIT("expect", test_expected_failure, "expected failures")
{
- xbt_test_add
0
("Skipped test");
+ xbt_test_add("Skipped test");
xbt_test_skip();
xbt_test_skip();
- xbt_test_add
2
("%s %s", "EXPECTED", "FAILURE");
+ xbt_test_add("%s %s", "EXPECTED", "FAILURE");
xbt_test_expect_failure();
xbt_test_expect_failure();
- xbt_test_log
2
("%s %s", "Test", "log");
- xbt_test_fail
0
("EXPECTED FAILURE");
+ xbt_test_log("%s %s", "Test", "log");
+ xbt_test_fail("EXPECTED FAILURE");
}
#endif /* SIMGRID_TEST */
}
#endif /* SIMGRID_TEST */