This is an archive of the discontinued LLVM Phabricator instance.

Differential D137056

[clangd] Fix a small inconsistency in system-include-extractor.test
ClosedPublic

Authored by nridge on Oct 31 2022, 12:22 AM.

Details

Reviewers
kadircet
Commits
rG41fa7d2093e0: [clangd] Fix a small inconsistency in system-include-extractor.test
Summary

Also add an explanatory comment

Diff Detail

Event Timeline

nridge created this revision.Oct 31 2022, 12:22 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 31 2022, 12:22 AM
Herald added a subscriber: arphaman. · View Herald Transcript
nridge requested review of this revision.Oct 31 2022, 12:22 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 31 2022, 12:22 AM
Herald added subscribers: cfe-commits, MaskRay, ilya-biryukov. · View Herald Transcript
nridge updated this revision to Diff 471908.Oct 31 2022, 12:25 AM

format comment better

nridge updated this revision to Diff 471909.Oct 31 2022, 12:25 AM

fix typo

Harbormaster completed remote builds in B195200: Diff 471909.Oct 31 2022, 12:44 AM
kadircet accepted this revision.Oct 31 2022, 2:31 AM

thanks!

clang-tools-extra/clangd/test/system-include-extractor.test
14–17

nit:

This revision is now accepted and ready to land.Oct 31 2022, 2:31 AM
nridge updated this revision to Diff 473588.Nov 7 2022, 12:29 AM

address nit

This revision was landed with ongoing or failed builds.Nov 7 2022, 12:30 AM
Closed by commit rG41fa7d2093e0: [clangd] Fix a small inconsistency in system-include-extractor.test (authored by nridge). · Explain Why
This revision was automatically updated to reflect the committed changes.
nridge added a commit: rG41fa7d2093e0: [clangd] Fix a small inconsistency in system-include-extractor.test.
Harbormaster completed remote builds in B196424: Diff 473588.Nov 7 2022, 12:30 AM

Revision Contents

PathSize
clang-tools-extra/
clangd/
test/
5 lines

Diff 471907

clang-tools-extra/clangd/test/system-include-extractor.test

# RUN: rm -rf %t.dir && mkdir -p %t.dir # RUN: rm -rf %t.dir && mkdir -p %t.dir
# The mock driver below is a shell script: # The mock driver below is a shell script:
# REQUIRES: shell # REQUIRES: shell
# Create a bin directory to store the mock-driver and add it to the path # Create a bin directory to store the mock-driver and add it to the path
# RUN: mkdir -p %t.dir/bin # RUN: mkdir -p %t.dir/bin
# RUN: export PATH=%t.dir/bin:$PATH # RUN: export PATH=%t.dir/bin:$PATH
# Generate a mock-driver that will print %temp_dir%/my/dir and # Generate a mock-driver that will print %temp_dir%/my/dir and
# %temp_dir%/my/dir2 as include search paths. # %temp_dir%/my/dir2 as include search paths.
# RUN: echo '#!/bin/sh' >> %t.dir/bin/my_driver.sh # RUN: echo '#!/bin/sh' >> %t.dir/bin/my_driver.sh
# RUN: echo '[ "$0" = "%t.dir/bin/my_driver.sh" ] || exit' >> %t.dir/bin/my_driver.sh # RUN: echo '[ "$0" = "%t.dir/bin/my_driver.sh" ] || exit' >> %t.dir/bin/my_driver.sh
# RUN: echo 'args="$*"' >> %t.dir/bin/my_driver.sh # RUN: echo 'args="$*"' >> %t.dir/bin/my_driver.sh
# The purpose of the three lines below is to test that the -nostdinc etc. arguments,
# all of which are present in the command in compile_commands.json below, are passed
# on by clang to the driver being queried (unlike most other arguments).
# RUN: echo '[ -z "${args##*"-nostdinc"*}" ] || exit' >> %t.dir/bin/my_driver.sh # RUN: echo '[ -z "${args##*"-nostdinc"*}" ] || exit' >> %t.dir/bin/my_driver.sh
kadircetUnsubmitted
Not Done
ReplyInline Actions
# RUN: echo 'args="$*"' >> %t.dir/bin/my_driver.sh
- # The purpose of the three lines below is to test that the -nostdinc etc.
- # arguments, all of which are present in the command in compile_commands.json
- # below, are passed on by clangd to the driver being queried (unlike most
- # other arguments).
+ # Check that clangd preserves certain flags like `-nostdinc` from
+ # original invocation in compile_commands.json.
# RUN: echo '[ -z "${args##*"-nostdinc"*}" ] || exit' >> %t.dir/bin/my_driver.sh

nit:

kadircet: nit:
# RUN: echo '[ -z "${args##*"-isysroot=/isysroot"*}" ] || exit' >> %t.dir/bin/my_driver.sh # RUN: echo '[ -z "${args##*"-isysroot=/isysroot"*}" ] || exit' >> %t.dir/bin/my_driver.sh
# RUN: echo 'echo " $* " | grep " --sysroot /my/sysroot/path " || exit' >> %t.dir/bin/my_driver.sh # RUN: echo '[ -z "${args##*"--sysroot /my/sysroot/path"*}" ] || exit' >> %t.dir/bin/my_driver.sh
# RUN: echo 'echo line to ignore >&2' >> %t.dir/bin/my_driver.sh # RUN: echo 'echo line to ignore >&2' >> %t.dir/bin/my_driver.sh
# RUN: echo 'printf "Target: arm-linux-gnueabihf\r\n" >&2' >> %t.dir/bin/my_driver.sh # RUN: echo 'printf "Target: arm-linux-gnueabihf\r\n" >&2' >> %t.dir/bin/my_driver.sh
# RUN: echo 'printf "#include <...> search starts here:\r\n" >&2' >> %t.dir/bin/my_driver.sh # RUN: echo 'printf "#include <...> search starts here:\r\n" >&2' >> %t.dir/bin/my_driver.sh
# RUN: echo 'echo %t.dir/my/dir/ >&2' >> %t.dir/bin/my_driver.sh # RUN: echo 'echo %t.dir/my/dir/ >&2' >> %t.dir/bin/my_driver.sh
# RUN: echo 'echo %t.dir/my/dir2/ >&2' >> %t.dir/bin/my_driver.sh # RUN: echo 'echo %t.dir/my/dir2/ >&2' >> %t.dir/bin/my_driver.sh
# RUN: echo 'printf "End of search list.\r\n" >&2' >> %t.dir/bin/my_driver.sh # RUN: echo 'printf "End of search list.\r\n" >&2' >> %t.dir/bin/my_driver.sh
# RUN: chmod +x %t.dir/bin/my_driver.sh # RUN: chmod +x %t.dir/bin/my_driver.sh
Show All 38 Lines