df: Import tests from NetBSD
AcceptedPublic
Actions

Authored by jlduran on Dec 1 2025, 3:59 PM.

Details

Reviewers

ngie

Group Reviewers

tests

Summary

Adapt NetBSD's tests to run on FreeBSD, rather than directly using the
tests under contrib, as the differences in spacing are significant.

It uses a mocked getmntinfo(3) implementation to ensure consistent file
system enumeration during testing, generating an h_df binary that is
used for testing.

Test Plan

$ kyua test
t_df:hflag  ->  passed  [0.021s]
t_df:normal  ->  passed  [0.010s]

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 69261
Build 66144: arc lint + arc unit

Event Timeline

jlduran created this revision.Dec 1 2025, 3:59 PM

Herald added a reviewer: ngie. · View Herald TranscriptDec 1 2025, 3:59 PM

Herald added subscribers: ivy, imp. · View Herald Transcript

jlduran requested review of this revision.Dec 1 2025, 3:59 PM

Harbormaster completed remote builds in B68963: Diff 167369.Dec 1 2025, 3:59 PM

I see some potential changes to df in GH #1906, let's start adding tests.

jlduran added a reviewer: tests.Dec 1 2025, 4:04 PM

NetBSD has fixed the output of their tests to match POSIX behavior (The percentage value shall be expressed as a positive integer, with any fractional result causing it to be rounded to the next highest integer) (lib/59811).

It is now our turn to fix it. Commit the output as is, for better comparison.

Harbormaster completed remote builds in B69261: Diff 168034.Mon, Dec 15, 5:41 AM

jlduran edited the summary of this revision. (Show Details)Wed, Dec 17, 4:56 AM

jlduran edited the test plan for this revision. (Show Details)

Keep the same NetBSD file name, we'll branch off our tests on another file.

jlduran added a child revision: D54264: df: ceil() the percentage value.Wed, Dec 17, 5:01 AM

ngie accepted this revision.Mon, Dec 29, 1:22 AM

ngie added inline comments.

bin/df/tests/getmntinfo.c
58	style(9) bug. clarity around order of operations.
90–91
121–122

This revision is now accepted and ready to land.Mon, Dec 29, 1:22 AM

Thank you!
I wanted as few diffs with NetBSD as possible, but using nitems() is a good suggestion; I'll probably submit it to GNATS.

In D54016#1243704, @jlduran wrote:

Thank you!
I wanted as few diffs with NetBSD as possible, but using nitems() is a good suggestion; I'll probably submit it to GNATS.

Ah, ok! If it's code that comes from NetBSD, we should use __arraycount(..) instead of nitems(..). __arraycount(..) is defined in libnetbsd.

What's the point of copying the NetBSD tests if we end up having to change everything about them, and then end up adding our own test script anyway as you do in D54265?

In D54016#1243870, @des wrote:

What's the point of copying the NetBSD tests if we end up having to change everything about them, and then end up adding our own test script anyway as you do in D54265?

The spacing between the columns is different. Also, getmntinfo.c is somewhat different on FreeBSD.
I tried to #ifdef this test, but it soon became obvious we should branch out (it became unreadable).

In D54016#1243879, @jlduran wrote:

In D54016#1243870, @des wrote:

What's the point of copying the NetBSD tests if we end up having to change everything about them, and then end up adding our own test script anyway as you do in D54265?

I tried to #ifdef this test, but it soon became obvious we should branch out (it became unreadable).

Yes. Just write your own.

In D54016#1243888, @des wrote:

In D54016#1243879, @jlduran wrote:

In D54016#1243870, @des wrote:

What's the point of copying the NetBSD tests if we end up having to change everything about them, and then end up adding our own test script anyway as you do in D54265?

I tried to #ifdef this test, but it soon became obvious we should branch out (it became unreadable).

Yes. Just write your own.