Skip to content

tests: drop unused or redundant includes #17717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 26 commits into from
Closed

tests: drop unused or redundant includes #17717

wants to merge 26 commits into from

Conversation

vszakats
Copy link
Member

@vszakats vszakats commented Jun 23, 2025 •
edited
Loading

@testclutch

This comment was marked as off-topic.

Sign in to view
@vszakats vszakats force-pushed the t-drop-unused-headers branch from 6ecca03 to b7a8ab8 Compare June 23, 2025 10:01
@vszakats vszakats changed the title tests/libtest: drop unused or redundant includes tests: drop unused or redundant includes Jun 23, 2025
vszakats added 25 commits June 23, 2025 13:48
@vszakats
first.c: drop duplicate includes
80ff2a1
@vszakats
libtest drop excess testutil.h includes
9751e32
@vszakats
lib653: drop stray warnless.h include
c8d53af
@vszakats
lib1903, 1905: drop stray timediff.h includes
f2a5c7f
@vszakats
libtest drop excess testtrace.h includes
1fd71d3
@vszakats
lib1531, 1507 drop redundant timediff.h includes
bb02d24
@vszakats
libtest drop limits.h where not used
5427fc5
@vszakats
libtest drop rest of limits.h because curl/curl.h already includes it
94a67d8 
Also lots of tests were already relying on this.
@vszakats
libtest drop stdio.h because curl/curl.h already includes it
b598e0d
@vszakats
tunit drop stdio.h because curl/curl.h already includes it
1e1fd93
@vszakats
tunit drop stdlib.h/string.h because curl_setup.h already includes them
2f7a08a
@vszakats
libtest drop fcntl.h because curl_setup.h already includes it
a04b2dc 
Some #includes were unguarded. This suggests that this header
is also fine to use without the feature guard and feature check.

(It's a POSIX header)
@vszakats
libtest drop string.h because curl_setup.h already includes it
5f8dc24
@vszakats
libtest drop unistd.h because curl_setup.h already includes it
03270de 
Some were guarded just by HAVE_PTHREAD_H, instead of its own guard.
@vszakats
libtest drop rest of limits.h because curl/curl.h already includes it 2
61167bf
@vszakats
libtest drop sys/stat.h because curl_setup.h already includes it
b918e5c 
Found unguarded includes here as well.
@vszakats
lib537: fixup func name in comment
3be114f
@vszakats
lib518: minor sync with lib537 (missing-support branch)
21a5e5a
@vszakats
libtest add comment to sys/resource.h
7590fd3
@vszakats
lib670 drop time.h because curl/curl.h already includes it
2d1bc8d
@vszakats
lib2032 drop assert.h because curl_setup.h already includes it
726eb95
@vszakats
client drop assert.h because curl_setup.h already includes it
71579b4
@vszakats
lib1960 drop sys/socket.h because curl/curl.h already includes it
5ecbf2a
@vszakats
client drop rest of stdlib.h/string.h because curl_setup.h already in…
533a008 
…cludes them
@vszakats
indent/whitespace
bc6bfc0
@vszakats vszakats force-pushed the t-drop-unused-headers branch from 115cff6 to 73737b0 Compare June 23, 2025 11:48
@vszakats vszakats closed this in 2636828 Jun 23, 2025
@vszakats vszakats deleted the t-drop-unused-headers branch June 23, 2025 11:49
@vszakats
Copy link
Member Author

vszakats commented Jun 23, 2025 •
edited
Loading

I've found it interesting that these headers (all POSIX) were used
unguarded in test code:
fcntl.h, sys/stat.h, unistd.h.

While the builds do the detections, and core code has the feature guards.

There is a fair chance these feature checks are redundant.

edit: unistd.h was dependent on HAVE_PTHREAD_H, and it's missing from some non-Unix platforms.

@vszakats vszakats mentioned this pull request Jun 23, 2025
Closed
vszakats added a commit that referenced this pull request Jun 24, 2025
@vszakats
build: stop checking for sys/stat.h
3ea0f71 
It has been used unconditionally in `src` and `tests` since at least
2011-09-19 via fdecb56. There are
earlier unguarded references in `tests`.

Also de-duplicate to include it just once.

Ref: #17717 (comment)

Closes #17724
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
tests tidy-up
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@vszakats @testclutch