[Driver] move NetBSD header search path management to the driver
ClosedPublic
Actions

Authored by brad on Jan 1 2023, 3:48 AM.

Details

Reviewers

MaskRay
mgorny
krytarowski

Commits

rGe97caa9a2855: Fixed Clang::Driver 'netbsd.c' test on Windows/Cross builders. NFC.
rGe449e1dff9f8: [Driver] move NetBSD header search path management to the driver

Summary

This matches OpenBSD and FreeBSD.

https://reviews.llvm.org/D138183

Diff Detail

Repository: rG LLVM Github Monorepo

Unit TestsFailed
View All

	Time	Test
	4,210 ms	x64 debian > Clang.Driver::netbsd.cpp Script: -- : 'RUN: at line 1'; /var/lib/buildkite-agent/builds/llvm-project/build/bin/clang --driver-mode=g++ --target=x86_64-unknown-netbsd -stdlib=platform --sysroot=/var/lib/buildkite-agent/builds/llvm-project/clang/test/Driver/Inputs/basic_netbsd_tree -### /var/lib/buildkite-agent/builds/llvm-project/clang/test/Driver/netbsd.cpp 2>&1 \| /var/lib/buildkite-agent/builds/llvm-project/build/bin/FileCheck -check-prefix=X86_64 /var/lib/buildkite-agent/builds/llvm-project/clang/test/Driver/netbsd.cpp

Event Timeline

brad created this revision.Jan 1 2023, 3:48 AM

Herald added a project: Restricted Project. · View Herald TranscriptJan 1 2023, 3:48 AM

Herald added subscribers: StephenFan, ormris, arichardson, emaste. · View Herald Transcript

brad requested review of this revision.Jan 1 2023, 3:48 AM

brad edited the summary of this revision. (Show Details)

Harbormaster completed remote builds in B205304: Diff 485801.Jan 1 2023, 4:22 AM

Thanks!

This revision is now accepted and ready to land.Jan 2 2023, 9:49 PM

Tweak test.

Harbormaster completed remote builds in B205863: Diff 486505.Jan 5 2023, 3:10 AM

This revision was landed with ongoing or failed builds.Jan 5 2023, 3:14 AM

Closed by commit rGe449e1dff9f8: [Driver] move NetBSD header search path management to the driver (authored by brad). · Explain Why

This revision was automatically updated to reflect the committed changes.

brad added a commit: rGe449e1dff9f8: [Driver] move NetBSD header search path management to the driver.

Hi @brad ,

would you fix the tests
https://lab.llvm.org/buildbot/#/builders/60/builds/10125

looks like the problem is here:

// DRIVER-PASS-INCLUDES:      "-internal-externc-isystem" "/usr/include"

could be another path instead of "/usr/include".

this one should work for the most cases

// DRIVER-PASS-INCLUDES:      "-internal-externc-isystem" "{{.*}}/usr/include"

Hi @brad,
thank you for fixing the broken tests.

There is still a problem with netbsd.c test: https://lab.llvm.org/buildbot/#/builders/60/builds/10135/steps/9/logs/FAIL__Clang__netbsd_c
Here:

// DRIVER-PASS-INCLUDES-SAME: {{^}} "-internal-isystem" "[[RESOURCE]]{{/|\\\\}}include"
// DRIVER-PASS-INCLUDES-SAME: {{^}} "-internal-externc-isystem" "{{.*}}/usr/include"

The first's {{^}} breaks the test. It can be removed from the first line or from the both of them.
The tests are getting passed without this part on the win-x-cross builders. They should work on Linux/BSD hosts with these changes.
Would you check and update the tests accordingly?

The following changes are working on my cross builders

// DRIVER-PASS-INCLUDES-SAME: "-internal-isystem" "[[RESOURCE]]{{/|\\\\}}include"
// DRIVER-PASS-INCLUDES-SAME: {{^}} "-internal-externc-isystem" "{{.*}}/usr/include"

and

// DRIVER-PASS-INCLUDES-SAME: "-internal-isystem" "[[RESOURCE]]{{/|\\\\}}include"
// DRIVER-PASS-INCLUDES-SAME: "-internal-externc-isystem" "{{.*}}/usr/include"

vvereschaka added a commit: rGe97caa9a2855: Fixed Clang::Driver 'netbsd.c' test on Windows/Cross builders. NFC..Jan 11 2023, 5:31 PM

probinson mentioned this in rGecb3cd0946a4: [Driver] Move PS4/PS5 header search path management to the driver.Feb 1 2023, 7:41 AM