This is an archive of the discontinued LLVM Phabricator instance.

Differential D101813

[Driver] Move -print-runtime-dir and -print-resource-dir tests
ClosedPublic

Authored by phosek on May 3 2021, 10:07 PM.

Details

Reviewers
MaskRay
Commits
rG9d3dbcd24c7d: [Driver] Move -print-runtime-dir and -print-resource-dir tests
Summary

Put these into a separate files to match other -print-* options tests.

Diff Detail

Event Timeline

phosek requested review of this revision.May 3 2021, 10:07 PM
phosek created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptMay 3 2021, 10:07 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B102457: Diff 342641.May 3 2021, 10:40 PM
MaskRay added inline comments.May 4 2021, 12:11 AM
clang/test/Driver/print-resource-dir.c
2

This isn't very useful. You can specify -resource-dir and check the output.

phosek updated this revision to Diff 342950.May 4 2021, 10:09 PM
phosek marked an inline comment as done.
MaskRay added inline comments.May 4 2021, 10:41 PM
clang/test/Driver/print-resource-dir.c
4

You can use -DFILE=%S/Inputs/resource-dir and check that the printed string is exactly [[FILE]].

Just use / and let Harbomaster confirm that Windows doesn't need backslash.

Harbormaster completed remote builds in B102671: Diff 342950.May 4 2021, 11:09 PM
phosek updated this revision to Diff 342954.May 4 2021, 11:30 PM
phosek marked an inline comment as done.
Harbormaster completed remote builds in B102675: Diff 342954.May 5 2021, 12:20 AM
phosek added inline comments.May 5 2021, 2:07 PM
clang/test/Driver/print-resource-dir.c
4

Thanks for the suggestion.

MaskRay accepted this revision.May 5 2021, 2:15 PM

Thanks!

This revision is now accepted and ready to land.May 5 2021, 2:15 PM
Closed by commit rG9d3dbcd24c7d: [Driver] Move -print-runtime-dir and -print-resource-dir tests (authored by phosek). · Explain WhyMay 5 2021, 3:24 PM
This revision was automatically updated to reflect the committed changes.
phosek added a commit: rG9d3dbcd24c7d: [Driver] Move -print-runtime-dir and -print-resource-dir tests.

Revision Contents

PathSize
clang/
test/
Driver/
17 lines
4 lines
11 lines

Diff 343212

clang/test/Driver/immediate-options.c

// RUN: %clang --help | FileCheck %s -check-prefix=HELP // RUN: %clang --help | FileCheck %s -check-prefix=HELP
// HELP: isystem // HELP: isystem
// HELP-NOT: ast-dump // HELP-NOT: ast-dump
// HELP-NOT: driver-mode // HELP-NOT: driver-mode
// Make sure that Flang-only options are not available in Clang // Make sure that Flang-only options are not available in Clang
// HELP-NOT: test-io // HELP-NOT: test-io
// RUN: %clang --help-hidden | FileCheck %s -check-prefix=HELP-HIDDEN // RUN: %clang --help-hidden | FileCheck %s -check-prefix=HELP-HIDDEN
// HELP-HIDDEN: driver-mode // HELP-HIDDEN: driver-mode
// HELP-HIDDEN-NOT: test-io // HELP-HIDDEN-NOT: test-io
// RUN: %clang -dumpversion | FileCheck %s -check-prefix=DUMPVERSION // RUN: %clang -dumpversion | FileCheck %s -check-prefix=DUMPVERSION
// DUMPVERSION: {{[0-9]+\.[0-9.]+}} // DUMPVERSION: {{[0-9]+\.[0-9.]+}}
// Test if the -print-resource-dir option is accepted without error.
// Allow unspecified output because the value of CLANG_RESOURCE_DIR is unknown.
// RUN: %clang -print-resource-dir | FileCheck %s -check-prefix=PRINT-RESOURCE-DIR
// PRINT-RESOURCE-DIR: {{.+}}
// Default resource-dir layout
// RUN: %clang -print-runtime-dir --target=x86_64-pc-windows-msvc \
// RUN: -resource-dir=%S/Inputs/resource_dir \
// RUN: | FileCheck --check-prefix=PRINT-RUNTIME-DIR %s
// PRINT-RUNTIME-DIR: lib{{/|\\}}windows
// Per target dir layout
// RUN: %clang -print-runtime-dir --target=x86_64-pc-windows-msvc \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
// RUN: | FileCheck --check-prefix=PRINT-RUNTIME-DIR-PER-TARGET %s
// PRINT-RUNTIME-DIR-PER-TARGET: lib{{/|\\}}x86_64-pc-windows-msvc

clang/test/Driver/print-resource-dir.c

  • This file was added.
// RUN: %clang -print-resource-dir --target=x86_64-unknown-linux-gnu \
// RUN: -resource-dir=%S/Inputs/resource_dir \
MaskRayUnsubmitted
Done
ReplyInline Actions

This isn't very useful. You can specify -resource-dir and check the output.

MaskRay: This isn't very useful. You can specify `-resource-dir` and check the output.
// RUN: | FileCheck -check-prefix=PRINT-RESOURCE-DIR -DFILE=%S/Inputs/resource_dir %s
// PRINT-RESOURCE-DIR: [[FILE]]
MaskRayUnsubmitted
Done
ReplyInline Actions

You can use -DFILE=%S/Inputs/resource-dir and check that the printed string is exactly [[FILE]].

Just use / and let Harbomaster confirm that Windows doesn't need backslash.

MaskRay: You can use `-DFILE=%S/Inputs/resource-dir` and check that the printed string is exactly `…
phosekAuthorUnsubmitted
Done
ReplyInline Actions

Thanks for the suggestion.

phosek: Thanks for the suggestion.

clang/test/Driver/print-runtime-dir.c

  • This file was added.
// Default directory layout
// RUN: %clang -print-runtime-dir --target=x86_64-pc-windows-msvc \
// RUN: -resource-dir=%S/Inputs/resource_dir \
// RUN: | FileCheck --check-prefix=PRINT-RUNTIME-DIR -DFILE=%S/Inputs/resource_dir %s
// PRINT-RUNTIME-DIR: [[FILE]]{{/|\\}}lib{{/|\\}}windows
// Per-target directory layout
// RUN: %clang -print-runtime-dir --target=x86_64-pc-windows-msvc \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
// RUN: | FileCheck --check-prefix=PRINT-RUNTIME-DIR-PER-TARGET -DFILE=%S/Inputs/resource_dir_with_per_target_subdir %s
// PRINT-RUNTIME-DIR-PER-TARGET: [[FILE]]{{/|\\}}lib{{/|\\}}x86_64-pc-windows-msvc