Skip to content

Commit bdf7026

Browse files
phomesphomes
committed
test: only use assert_se
The asserts used in the tests should never be allowed to be optimized away
1 parent 2355af6 commit bdf7026

18 files changed

+169
-169
lines changed

‎src/test/test-cgroup-mask.c‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static int test_cgroup_mask(void) {
4545
puts("manager_new: Permission denied. Skipping test.");
4646
return EXIT_TEST_SKIP;
4747
}
48-
assert(r >= 0);
48+
assert_se(r >= 0);
4949
assert_se(manager_startup(m, serial, fdset) >= 0);
5050

5151
/* Load units and verify hierarchy. */
@@ -54,48 +54,48 @@ static int test_cgroup_mask(void) {
5454
assert_se(manager_load_unit(m, "daughter.service", NULL, NULL, &daughter) >= 0);
5555
assert_se(manager_load_unit(m, "grandchild.service", NULL, NULL, &grandchild) >= 0);
5656
assert_se(manager_load_unit(m, "parent-deep.slice", NULL, NULL, &parent_deep) >= 0);
57-
assert(parent->load_state == UNIT_LOADED);
58-
assert(son->load_state == UNIT_LOADED);
59-
assert(daughter->load_state == UNIT_LOADED);
60-
assert(grandchild->load_state == UNIT_LOADED);
61-
assert(parent_deep->load_state == UNIT_LOADED);
62-
assert(UNIT_DEREF(son->slice) == parent);
63-
assert(UNIT_DEREF(daughter->slice) == parent);
64-
assert(UNIT_DEREF(parent_deep->slice) == parent);
65-
assert(UNIT_DEREF(grandchild->slice) == parent_deep);
57+
assert_se(parent->load_state == UNIT_LOADED);
58+
assert_se(son->load_state == UNIT_LOADED);
59+
assert_se(daughter->load_state == UNIT_LOADED);
60+
assert_se(grandchild->load_state == UNIT_LOADED);
61+
assert_se(parent_deep->load_state == UNIT_LOADED);
62+
assert_se(UNIT_DEREF(son->slice) == parent);
63+
assert_se(UNIT_DEREF(daughter->slice) == parent);
64+
assert_se(UNIT_DEREF(parent_deep->slice) == parent);
65+
assert_se(UNIT_DEREF(grandchild->slice) == parent_deep);
6666
root = UNIT_DEREF(parent->slice);
6767

6868
/* Verify per-unit cgroups settings. */
69-
assert(unit_get_cgroup_mask(son) == (CGROUP_CPU | CGROUP_CPUACCT));
70-
assert(unit_get_cgroup_mask(daughter) == 0);
71-
assert(unit_get_cgroup_mask(grandchild) == 0);
72-
assert(unit_get_cgroup_mask(parent_deep) == CGROUP_MEMORY);
73-
assert(unit_get_cgroup_mask(parent) == CGROUP_BLKIO);
74-
assert(unit_get_cgroup_mask(root) == 0);
69+
assert_se(unit_get_cgroup_mask(son) == (CGROUP_CPU | CGROUP_CPUACCT));
70+
assert_se(unit_get_cgroup_mask(daughter) == 0);
71+
assert_se(unit_get_cgroup_mask(grandchild) == 0);
72+
assert_se(unit_get_cgroup_mask(parent_deep) == CGROUP_MEMORY);
73+
assert_se(unit_get_cgroup_mask(parent) == CGROUP_BLKIO);
74+
assert_se(unit_get_cgroup_mask(root) == 0);
7575

7676
/* Verify aggregation of member masks */
77-
assert(unit_get_members_mask(son) == 0);
78-
assert(unit_get_members_mask(daughter) == 0);
79-
assert(unit_get_members_mask(grandchild) == 0);
80-
assert(unit_get_members_mask(parent_deep) == 0);
81-
assert(unit_get_members_mask(parent) == (CGROUP_CPU | CGROUP_CPUACCT | CGROUP_MEMORY));
82-
assert(unit_get_members_mask(root) == (CGROUP_CPU | CGROUP_CPUACCT | CGROUP_BLKIO | CGROUP_MEMORY));
77+
assert_se(unit_get_members_mask(son) == 0);
78+
assert_se(unit_get_members_mask(daughter) == 0);
79+
assert_se(unit_get_members_mask(grandchild) == 0);
80+
assert_se(unit_get_members_mask(parent_deep) == 0);
81+
assert_se(unit_get_members_mask(parent) == (CGROUP_CPU | CGROUP_CPUACCT | CGROUP_MEMORY));
82+
assert_se(unit_get_members_mask(root) == (CGROUP_CPU | CGROUP_CPUACCT | CGROUP_BLKIO | CGROUP_MEMORY));
8383

8484
/* Verify aggregation of sibling masks. */
85-
assert(unit_get_siblings_mask(son) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_MEMORY) & m->cgroup_supported));
86-
assert(unit_get_siblings_mask(daughter) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_MEMORY) & m->cgroup_supported));
87-
assert(unit_get_siblings_mask(grandchild) == 0);
88-
assert(unit_get_siblings_mask(parent_deep) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_MEMORY) & m->cgroup_supported));
89-
assert(unit_get_siblings_mask(parent) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_BLKIO | CGROUP_MEMORY) & m->cgroup_supported));
90-
assert(unit_get_siblings_mask(root) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_BLKIO | CGROUP_MEMORY) & m->cgroup_supported));
85+
assert_se(unit_get_siblings_mask(son) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_MEMORY) & m->cgroup_supported));
86+
assert_se(unit_get_siblings_mask(daughter) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_MEMORY) & m->cgroup_supported));
87+
assert_se(unit_get_siblings_mask(grandchild) == 0);
88+
assert_se(unit_get_siblings_mask(parent_deep) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_MEMORY) & m->cgroup_supported));
89+
assert_se(unit_get_siblings_mask(parent) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_BLKIO | CGROUP_MEMORY) & m->cgroup_supported));
90+
assert_se(unit_get_siblings_mask(root) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_BLKIO | CGROUP_MEMORY) & m->cgroup_supported));
9191

9292
/* Verify aggregation of target masks. */
93-
assert(unit_get_target_mask(son) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_MEMORY) & m->cgroup_supported));
94-
assert(unit_get_target_mask(daughter) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_MEMORY) & m->cgroup_supported));
95-
assert(unit_get_target_mask(grandchild) == 0);
96-
assert(unit_get_target_mask(parent_deep) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_MEMORY) & m->cgroup_supported));
97-
assert(unit_get_target_mask(parent) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_BLKIO | CGROUP_MEMORY) & m->cgroup_supported));
98-
assert(unit_get_target_mask(root) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_BLKIO | CGROUP_MEMORY) & m->cgroup_supported));
93+
assert_se(unit_get_target_mask(son) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_MEMORY) & m->cgroup_supported));
94+
assert_se(unit_get_target_mask(daughter) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_MEMORY) & m->cgroup_supported));
95+
assert_se(unit_get_target_mask(grandchild) == 0);
96+
assert_se(unit_get_target_mask(parent_deep) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_MEMORY) & m->cgroup_supported));
97+
assert_se(unit_get_target_mask(parent) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_BLKIO | CGROUP_MEMORY) & m->cgroup_supported));
98+
assert_se(unit_get_target_mask(root) == ((CGROUP_CPU | CGROUP_CPUACCT | CGROUP_BLKIO | CGROUP_MEMORY) & m->cgroup_supported));
9999

100100
manager_free(m);
101101

‎src/test/test-cgroup.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ int main(int argc, char*argv[]) {
7979
assert_se(cg_delete(SYSTEMD_CGROUP_CONTROLLER, "/test-a") >= 0);
8080

8181
assert_se(cg_split_spec("foobar:/", &c, &p) == 0);
82-
assert(streq(c, "foobar"));
83-
assert(streq(p, "/"));
82+
assert_se(streq(c, "foobar"));
83+
assert_se(streq(p, "/"));
8484
free(c);
8585
free(p);
8686

@@ -92,13 +92,13 @@ int main(int argc, char*argv[]) {
9292
assert_se(cg_split_spec("fo/obar:/", &c, &p) < 0);
9393

9494
assert_se(cg_split_spec("/", &c, &p) >= 0);
95-
assert(c == NULL);
96-
assert(streq(p, "/"));
95+
assert_se(c == NULL);
96+
assert_se(streq(p, "/"));
9797
free(p);
9898

9999
assert_se(cg_split_spec("foo", &c, &p) >= 0);
100-
assert(streq(c, "foo"));
101-
assert(p == NULL);
100+
assert_se(streq(c, "foo"));
101+
assert_se(p == NULL);
102102
free(c);
103103

104104
return 0;

‎src/test/test-engine.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ int main(int argc, char *argv[]) {
4343
printf("Skipping test: manager_new: %s", strerror(-r));
4444
return EXIT_TEST_SKIP;
4545
}
46-
assert(r >= 0);
46+
assert_se(r >= 0);
4747
assert_se(manager_startup(m, serial, fdset) >= 0);
4848

4949
printf("Load1:\n");
@@ -56,7 +56,7 @@ int main(int argc, char *argv[]) {
5656
r = manager_add_job(m, JOB_START, c, JOB_REPLACE, false, &err, &j);
5757
if (sd_bus_error_is_set(&err))
5858
log_error("error: %s: %s", err.name, err.message);
59-
assert(r == 0);
59+
assert_se(r == 0);
6060
manager_dump_jobs(m, stdout, "\t");
6161

6262
printf("Load2:\n");

‎src/test/test-fileio.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -246,25 +246,25 @@ static void test_status_field(void) {
246246

247247
r = get_status_field("/proc/meminfo", "MemTotal:", &p);
248248
if (r != -ENOENT) {
249-
assert(r == 0);
249+
assert_se(r == 0);
250250
puts(p);
251251
assert_se(safe_atollu(p, &total) == 0);
252252
}
253253

254254
r = get_status_field("/proc/meminfo", "\nBuffers:", &s);
255255
if (r != -ENOENT) {
256-
assert(r == 0);
256+
assert_se(r == 0);
257257
puts(s);
258258
assert_se(safe_atollu(s, &buffers) == 0);
259259
}
260260

261261
if (p)
262-
assert(buffers < total);
262+
assert_se(buffers < total);
263263

264264
/* Seccomp should be a good test for field full of zeros. */
265265
r = get_status_field("/proc/meminfo", "\nSeccomp:", &z);
266266
if (r != -ENOENT) {
267-
assert(r == 0);
267+
assert_se(r == 0);
268268
puts(z);
269269
assert_se(safe_atollu(z, &buffers) == 0);
270270
}
@@ -283,10 +283,10 @@ static void test_capeff(void) {
283283
if (r == -ENOENT || r == -EPERM)
284284
return;
285285

286-
assert(r == 0);
287-
assert(*capeff);
286+
assert_se(r == 0);
287+
assert_se(*capeff);
288288
p = capeff[strspn(capeff, DIGITS "abcdefABCDEF")];
289-
assert(!p || isspace(p));
289+
assert_se(!p || isspace(p));
290290
}
291291
}
292292

‎src/test/test-hashmap.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ static void test_hashmap_steal_first(void) {
522522
while ((val = hashmap_steal_first(m)))
523523
seen[strlen(val) - 1]++;
524524

525-
assert(seen[0] == 1 && seen[1] == 1 && seen[2] == 1);
525+
assert_se(seen[0] == 1 && seen[1] == 1 && seen[2] == 1);
526526

527527
assert_se(hashmap_isempty(m));
528528
}

‎src/test/test-install.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
static void dump_changes(UnitFileChange *c, unsigned n) {
3232
unsigned i;
3333

34-
assert(n == 0 || c);
34+
assert_se(n == 0 || c);
3535

3636
for (i = 0; i < n; i++) {
3737
if (c[i].type == UNIT_FILE_UNLINK)

‎src/test/test-job-type.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,46 +52,46 @@ int main(int argc, char*argv[]) {
5252
merged_ab = (job_type_merge_and_collapse(&ab, b, u) >= 0);
5353

5454
if (!job_type_is_mergeable(a, b)) {
55-
assert(!merged_ab);
55+
assert_se(!merged_ab);
5656
printf("Not mergeable: %s + %s\n", job_type_to_string(a), job_type_to_string(b));
5757
continue;
5858
}
5959

60-
assert(merged_ab);
60+
assert_se(merged_ab);
6161
printf("%s + %s = %s\n", job_type_to_string(a), job_type_to_string(b), job_type_to_string(ab));
6262

6363
for (c = 0; c < _JOB_TYPE_MAX_MERGING; c++) {
6464

6565
/* Verify transitivity of mergeability of job types */
66-
assert(!job_type_is_mergeable(a, b) ||
66+
assert_se(!job_type_is_mergeable(a, b) ||
6767
!job_type_is_mergeable(b, c) ||
6868
job_type_is_mergeable(a, c));
6969

7070
/* Verify that merged entries can be merged with the same entries
7171
* they can be merged with separately */
72-
assert(!job_type_is_mergeable(a, c) || job_type_is_mergeable(ab, c));
73-
assert(!job_type_is_mergeable(b, c) || job_type_is_mergeable(ab, c));
72+
assert_se(!job_type_is_mergeable(a, c) || job_type_is_mergeable(ab, c));
73+
assert_se(!job_type_is_mergeable(b, c) || job_type_is_mergeable(ab, c));
7474

7575
/* Verify that if a merged with b is not mergeable with c, then
7676
* either a or b is not mergeable with c either. */
77-
assert(job_type_is_mergeable(ab, c) || !job_type_is_mergeable(a, c) || !job_type_is_mergeable(b, c));
77+
assert_se(job_type_is_mergeable(ab, c) || !job_type_is_mergeable(a, c) || !job_type_is_mergeable(b, c));
7878

7979
bc = b;
8080
if (job_type_merge_and_collapse(&bc, c, u) >= 0) {
8181

8282
/* Verify associativity */
8383

8484
ab_c = ab;
85-
assert(job_type_merge_and_collapse(&ab_c, c, u) == 0);
85+
assert_se(job_type_merge_and_collapse(&ab_c, c, u) == 0);
8686

8787
bc_a = bc;
88-
assert(job_type_merge_and_collapse(&bc_a, a, u) == 0);
88+
assert_se(job_type_merge_and_collapse(&bc_a, a, u) == 0);
8989

9090
a_bc = a;
91-
assert(job_type_merge_and_collapse(&a_bc, bc, u) == 0);
91+
assert_se(job_type_merge_and_collapse(&a_bc, bc, u) == 0);
9292

93-
assert(ab_c == bc_a);
94-
assert(ab_c == a_bc);
93+
assert_se(ab_c == bc_a);
94+
assert_se(ab_c == a_bc);
9595

9696
printf("%s + %s + %s = %s\n", job_type_to_string(a), job_type_to_string(b), job_type_to_string(c), job_type_to_string(ab_c));
9797
}

‎src/test/test-libudev.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ static void test_hwdb(struct udev *udev, const char *modalias) {
407407
printf("\n");
408408

409409
hwdb = udev_hwdb_unref(hwdb);
410-
assert(hwdb == NULL);
410+
assert_se(hwdb == NULL);
411411
}
412412

413413
int main(int argc, char *argv[]) {

‎src/test/test-sched-prio.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) {
3939
printf("Skipping test: manager_new: %s", strerror(-r));
4040
return EXIT_TEST_SKIP;
4141
}
42-
assert(r >= 0);
42+
assert_se(r >= 0);
4343
assert_se(manager_startup(m, serial, fdset) >= 0);
4444

4545
/* load idle ok */

‎src/test/test-set.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static void test_set_steal_first(void) {
3535
while ((val = set_steal_first(m)))
3636
seen[strlen(val) - 1]++;
3737

38-
assert(seen[0] == 1 && seen[1] == 1 && seen[2] == 1);
38+
assert_se(seen[0] == 1 && seen[1] == 1 && seen[2] == 1);
3939

4040
assert_se(set_isempty(m));
4141
}

0 commit comments

Comments
 (0)