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
Free memory after parmap test.
[simgrid.git]
/
src
/
xbt
/
ex.c
diff --git
a/src/xbt/ex.c
b/src/xbt/ex.c
index
aa8836c
..
ade191b
100644
(file)
--- a/
src/xbt/ex.c
+++ b/
src/xbt/ex.c
@@
-241,48
+241,48
@@
XBT_TEST_UNIT("controlflow", test_controlflow, "basic nested control flow")
xbt_ex_t ex;
volatile int n = 1;
xbt_ex_t ex;
volatile int n = 1;
- xbt_test_add
0
("basic nested control flow");
+ xbt_test_add("basic nested control flow");
TRY {
if (n != 1)
TRY {
if (n != 1)
- xbt_test_fail
1
("M1: n=%d (!= 1)", n);
+ xbt_test_fail("M1: n=%d (!= 1)", n);
n++;
TRY {
if (n != 2)
n++;
TRY {
if (n != 2)
- xbt_test_fail
1
("M2: n=%d (!= 2)", n);
+ xbt_test_fail("M2: n=%d (!= 2)", n);
n++;
THROW0(unknown_error, 0, "something");
}
CATCH(ex) {
if (n != 3)
n++;
THROW0(unknown_error, 0, "something");
}
CATCH(ex) {
if (n != 3)
- xbt_test_fail
1
("M3: n=%d (!= 3)", n);
+ xbt_test_fail("M3: n=%d (!= 3)", n);
n++;
xbt_ex_free(ex);
}
n++;
TRY {
if (n != 5)
n++;
xbt_ex_free(ex);
}
n++;
TRY {
if (n != 5)
- xbt_test_fail
1
("M2: n=%d (!= 5)", n);
+ xbt_test_fail("M2: n=%d (!= 5)", n);
n++;
THROW0(unknown_error, 0, "something");
}
CATCH(ex) {
if (n != 6)
n++;
THROW0(unknown_error, 0, "something");
}
CATCH(ex) {
if (n != 6)
- xbt_test_fail
1
("M3: n=%d (!= 6)", n);
+ xbt_test_fail("M3: n=%d (!= 6)", n);
n++;
RETHROW;
n++;
}
n++;
RETHROW;
n++;
}
- xbt_test_fail
1
("MX: n=%d (shouldn't reach this point)", n);
+ xbt_test_fail("MX: n=%d (shouldn't reach this point)", n);
}
CATCH(ex) {
if (n != 7)
}
CATCH(ex) {
if (n != 7)
- xbt_test_fail
1
("M4: n=%d (!= 7)", n);
+ xbt_test_fail("M4: n=%d (!= 7)", n);
n++;
xbt_ex_free(ex);
}
if (n != 8)
n++;
xbt_ex_free(ex);
}
if (n != 8)
- xbt_test_fail
1
("M5: n=%d (!= 8)", n);
+ xbt_test_fail("M5: n=%d (!= 8)", n);
}
XBT_TEST_UNIT("value", test_value, "exception value passing")
}
XBT_TEST_UNIT("value", test_value, "exception value passing")
@@
-293,13
+293,13
@@
XBT_TEST_UNIT("value", test_value, "exception value passing")
THROW0(unknown_error, 2, "toto");
}
CATCH(ex) {
THROW0(unknown_error, 2, "toto");
}
CATCH(ex) {
- xbt_test_add
0
("exception value passing");
+ xbt_test_add("exception value passing");
if (ex.category != unknown_error)
if (ex.category != unknown_error)
- xbt_test_fail
1
("category=%d (!= 1)", ex.category);
+ xbt_test_fail("category=%d (!= 1)", ex.category);
if (ex.value != 2)
if (ex.value != 2)
- xbt_test_fail
1
("value=%d (!= 2)", ex.value);
+ xbt_test_fail("value=%d (!= 2)", ex.value);
if (strcmp(ex.msg, "toto"))
if (strcmp(ex.msg, "toto"))
- xbt_test_fail
1
("message=%s (!= toto)", ex.msg);
+ xbt_test_fail("message=%s (!= toto)", ex.msg);
xbt_ex_free(ex);
}
}
xbt_ex_free(ex);
}
}
@@
-316,14
+316,14
@@
XBT_TEST_UNIT("variables", test_variables, "variable value preservation")
v2 = 5678;
THROW0(unknown_error, 0, "toto");
} CATCH(ex) {
v2 = 5678;
THROW0(unknown_error, 0, "toto");
} CATCH(ex) {
- xbt_test_add
0
("variable preservation");
+ xbt_test_add("variable preservation");
if (r1 != 1234)
if (r1 != 1234)
- xbt_test_fail
1
("r1=%d (!= 1234)", r1);
+ xbt_test_fail("r1=%d (!= 1234)", r1);
if (v1 != 1234)
if (v1 != 1234)
- xbt_test_fail
1
("v1=%d (!= 1234)", v1);
+ xbt_test_fail("v1=%d (!= 1234)", v1);
/* r2 is allowed to be destroyed because not volatile */
if (v2 != 5678)
/* r2 is allowed to be destroyed because not volatile */
if (v2 != 5678)
- xbt_test_fail
1
("v2=%d (!= 5678)", v2);
+ xbt_test_fail("v2=%d (!= 5678)", v2);
xbt_ex_free(ex);
}
}
xbt_ex_free(ex);
}
}
@@
-334,7
+334,7
@@
XBT_TEST_UNIT("cleanup", test_cleanup, "cleanup handling")
volatile int v1;
int c;
volatile int v1;
int c;
- xbt_test_add
0
("cleanup handling");
+ xbt_test_add("cleanup handling");
v1 = 1234;
c = 0;
v1 = 1234;
c = 0;
@@
-343,18
+343,18
@@
XBT_TEST_UNIT("cleanup", test_cleanup, "cleanup handling")
THROW0(1, 2, "blah");
} TRY_CLEANUP {
if (v1 != 5678)
THROW0(1, 2, "blah");
} TRY_CLEANUP {
if (v1 != 5678)
- xbt_test_fail
1
("v1 = %d (!= 5678)", v1);
+ xbt_test_fail("v1 = %d (!= 5678)", v1);
c = 1;
}
CATCH(ex) {
if (v1 != 5678)
c = 1;
}
CATCH(ex) {
if (v1 != 5678)
- xbt_test_fail
1
("v1 = %d (!= 5678)", v1);
+ xbt_test_fail("v1 = %d (!= 5678)", v1);
if (!(ex.category == 1 && ex.value == 2 && !strcmp(ex.msg, "blah")))
if (!(ex.category == 1 && ex.value == 2 && !strcmp(ex.msg, "blah")))
- xbt_test_fail
0
("unexpected exception contents");
+ xbt_test_fail("unexpected exception contents");
xbt_ex_free(ex);
}
if (!c)
xbt_ex_free(ex);
}
if (!c)
- xbt_test_fail
0
("xbt_ex_free not executed");
+ xbt_test_fail("xbt_ex_free not executed");
}
}