Page MenuHomeFreeBSD

dtrace tests: Support globbing for excludes
ClosedPublic

Authored by bdrewery on Apr 28 2020, 9:27 PM.

Details

Summary

Downstream this makes skipping tests like common/ip/tst.*sctp*.ksh simpler.

Sponsored by: Dell EMC

Test Plan

With this in cddl/usr.sbin/dtrace/tests/tools/exclude.sh:

exclude EXFAIL common/ip/tst.*sctp*.ksh
t_dtrace_contrib:tst_ipv4localicmp_ksh  ->  passed  [0.599s]
t_dtrace_contrib:tst_ipv4localsctp_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.553s]
t_dtrace_contrib:tst_ipv4localtcp_ksh  ->  passed  [2.739s]
t_dtrace_contrib:tst_ipv4localudp_ksh  ->  passed  [2.751s]
t_dtrace_contrib:tst_ipv4localudplite_ksh  ->  passed  [2.698s]
t_dtrace_contrib:tst_ipv4remoteicmp_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.054s]
t_dtrace_contrib:tst_ipv4remotesctp_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.043s]
t_dtrace_contrib:tst_ipv4remotetcp_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.049s]
t_dtrace_contrib:tst_ipv4remoteudp_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.043s]
t_dtrace_contrib:tst_ipv4remoteudplite_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.061s]
t_dtrace_contrib:tst_ipv6localicmp_ksh  ->  passed  [0.603s]
t_dtrace_contrib:tst_ipv6remoteicmp_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.048s]
t_dtrace_contrib:tst_localsctpstate_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.586s]
t_dtrace_contrib:tst_localtcpstate_ksh  ->  passed  [2.673s]
t_dtrace_contrib:tst_remotesctpstate_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.060s]
t_dtrace_contrib:tst_remotetcpstate_ksh  ->  expected_failure: test is known to fail: atf-check failed; see the output of the test for details  [0.040s]

Diff Detail

Repository
rS FreeBSD src repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

bdrewery created this revision.

Meant to remove the default TESTBASE before submitting.

cddl/usr.sbin/dtrace/tests/tools/exclude.sh
36 ↗(On Diff #71128)

If the glob fails, say due to a typo, this will infinitely recurse.

Handle invalid globs

Invalid exclude for common/ip/tst.*sctp*.ksh*blah
This revision is now accepted and ready to land.Apr 28 2020, 9:59 PM

I like the idea. I can't say I read shell well enough to review the implementation much.

markj added inline comments.
cddl/usr.sbin/dtrace/tests/dtrace.test.mk
22 ↗(On Diff #71131)

Why do we need :Q?

cddl/usr.sbin/dtrace/tests/tools/exclude.sh
41 ↗(On Diff #71131)

I think the other files in this dir indent by four spaces.

bdrewery added inline comments.
cddl/usr.sbin/dtrace/tests/dtrace.test.mk
22 ↗(On Diff #71131)

SRCTOP may have spaces in it.

cddl/usr.sbin/dtrace/tests/tools/exclude.sh
41 ↗(On Diff #71131)

True. I noticed but only 1 line had it in this file so I dumped it as my vim was unhappy. I can keep the same style as the directory though.

This revision now requires review to proceed.Apr 29 2020, 5:31 PM
markj added inline comments.
cddl/usr.sbin/dtrace/tests/dtrace.test.mk
22 ↗(On Diff #71131)

I see now, thanks. Misunderstood that operator.

This revision is now accepted and ready to land.Apr 29 2020, 5:32 PM
This revision was automatically updated to reflect the committed changes.