- ret = strcmp(fres_contract_get_label(c1)->label,
- fres_contract_get_label(c2)->label);
- if (ret) error(1, 0, "%s: label cmp failed %d", msg, ret);
-
- ret = memcmp(fres_contract_get_resource(c1),
- fres_contract_get_resource(c2),
- sizeof(fres_block_resource));
- if (ret) error(1, 0, "%s: resource cmp failed %d", msg, ret);
-
- ret = memcmp(fres_contract_get_basic(c1),
- fres_contract_get_basic(c2),
- sizeof(fres_block_basic));
- if (ret) error(1, 0, "%s: basic cmp failed %d", msg, ret);
-
- ret = memcmp(fres_contract_get_timing_reqs(c1),
- fres_contract_get_timing_reqs(c2),
- sizeof(fres_block_timing_reqs));
- if (ret) error(1, 0, "%s: timing_reqs cmp failed %d", msg, ret);
-
+ if (!WVPASS((ret = strcmp(fres_contract_get_label(c1)->label,
+ fres_contract_get_label(c2)->label)) == 0))
+ error(1, 0, "%s: label cmp failed %d", msg, ret);
+
+ if (!WVPASS((ret = memcmp(fres_contract_get_resource(c1),
+ fres_contract_get_resource(c2),
+ sizeof(fres_block_resource))) == 0))
+ error(1, 0, "%s: resource cmp failed %d", msg, ret);
+
+ if (!WVPASS((ret = memcmp(fres_contract_get_basic(c1),
+ fres_contract_get_basic(c2),
+ sizeof(fres_block_basic))) == 0))
+ error(1, 0, "%s: basic cmp failed %d", msg, ret);
+
+ if (!WVPASS((ret = memcmp(fres_contract_get_timing_reqs(c1),
+ fres_contract_get_timing_reqs(c2),
+ sizeof(fres_block_timing_reqs))) == 0))
+ error(1, 0, "%s: timing_reqs cmp failed %d", msg, ret);
+