This is an archive of the discontinued LLVM Phabricator instance.

Differential D132984

Set HOME for tests that use module cache path
ClosedPublic

Authored by ccross on Aug 30 2022, 4:27 PM.

Details

Reviewers
pirama
rsmith
srhines
Commits
rG7fe475756b26: Set HOME for tests that use module cache path
Summary

Getting the default module cache path calls llvm::sys::path::cache_directory,
which calls home_directory, which checks the HOME environment variable
before falling back to getpwuid. When compiling against musl libc,
which does not support NSS, and running on a machine that doesn't have
the current user in /etc/passwd due to NSS, no home directory can
be found. Set the HOME environment variable in the tests to avoid
depending on getpwuid.

Diff Detail

Event Timeline

ccross created this revision.Aug 30 2022, 4:27 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 30 2022, 4:27 PM
ccross requested review of this revision.Aug 30 2022, 4:27 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 30 2022, 4:27 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B184257: Diff 456816.Aug 30 2022, 4:54 PM
ccross added a reviewer: rsmith.Aug 31 2022, 11:43 AM
pirama accepted this revision.Sep 14 2022, 12:01 PM
pirama added a reviewer: srhines.
This revision is now accepted and ready to land.Sep 14 2022, 12:01 PM
srhines accepted this revision.Sep 14 2022, 12:07 PM
Closed by commit rG7fe475756b26: Set HOME for tests that use module cache path (authored by ccross, committed by pirama). · Explain WhySep 15 2022, 5:10 PM
This revision was automatically updated to reflect the committed changes.
pirama added a commit: rG7fe475756b26: Set HOME for tests that use module cache path.

Revision Contents

PathSize
clang/
test/
Driver/
2 lines
Modules/
2 lines
Unit/
3 lines

Diff 460558

clang/test/Driver/modules-cache-path.m

// RUN: %clang -fmodules -### %s 2>&1 | FileCheck %s -check-prefix=CHECK-DEFAULT // RUN: env HOME=%t.home %clang -fmodules -### %s 2>&1 | FileCheck %s -check-prefix=CHECK-DEFAULT
// CHECK-DEFAULT: -fmodules-cache-path={{.*}}clang{{[/\\]+}}ModuleCache // CHECK-DEFAULT: -fmodules-cache-path={{.*}}clang{{[/\\]+}}ModuleCache
// RUN: env CLANG_MODULE_CACHE_PATH=/dev/null \ // RUN: env CLANG_MODULE_CACHE_PATH=/dev/null \
// RUN: %clang -fmodules -### %s 2>&1 | FileCheck %s -check-prefix=OVERRIDE // RUN: %clang -fmodules -### %s 2>&1 | FileCheck %s -check-prefix=OVERRIDE
// OVERRIDE: -fmodules-cache-path=/dev/null // OVERRIDE: -fmodules-cache-path=/dev/null
// RUN: env CLANG_MODULE_CACHE_PATH= \ // RUN: env CLANG_MODULE_CACHE_PATH= \
// RUN: %clang -fmodules -### %s 2>&1 | FileCheck %s -check-prefix=DISABLE // RUN: %clang -fmodules -### %s 2>&1 | FileCheck %s -check-prefix=DISABLE
// DISABLE-NOT: -fmodules-cache-path= // DISABLE-NOT: -fmodules-cache-path=

clang/test/Modules/driver.c

// RUN: %clang -fmodules -fimplicit-module-maps %s -### 2>&1 | FileCheck -check-prefix CHECK-NO_MODULE_CACHE %s // RUN: env HOME=%t.home %clang -fmodules -fimplicit-module-maps %s -### 2>&1 | FileCheck -check-prefix CHECK-NO_MODULE_CACHE %s
// RUN: %clang -fmodules -fimplicit-module-maps -fmodules-cache-path=blarg %s -### 2>&1 | FileCheck -check-prefix CHECK-WITH_MODULE_CACHE %s // RUN: %clang -fmodules -fimplicit-module-maps -fmodules-cache-path=blarg %s -### 2>&1 | FileCheck -check-prefix CHECK-WITH_MODULE_CACHE %s
// CHECK-NO_MODULE_CACHE: {{clang.*"-fmodules-cache-path=.*ModuleCache"}} // CHECK-NO_MODULE_CACHE: {{clang.*"-fmodules-cache-path=.*ModuleCache"}}
// CHECK-WITH_MODULE_CACHE: {{clang.*"-fmodules-cache-path=blarg"}} // CHECK-WITH_MODULE_CACHE: {{clang.*"-fmodules-cache-path=blarg"}}

clang/test/Unit/lit.cfg.py

Show All 24 Lines
# Propagate the temp directory. Windows requires this because it uses \Windows\ # Propagate the temp directory. Windows requires this because it uses \Windows\
# if none of these are present. # if none of these are present.
if 'TMP' in os.environ: if 'TMP' in os.environ:
config.environment['TMP'] = os.environ['TMP'] config.environment['TMP'] = os.environ['TMP']
if 'TEMP' in os.environ: if 'TEMP' in os.environ:
config.environment['TEMP'] = os.environ['TEMP'] config.environment['TEMP'] = os.environ['TEMP']
if 'HOME' in os.environ:
config.environment['HOME'] = os.environ['HOME']
# Propagate sanitizer options. # Propagate sanitizer options.
for var in [ for var in [
'ASAN_SYMBOLIZER_PATH', 'ASAN_SYMBOLIZER_PATH',
'HWASAN_SYMBOLIZER_PATH', 'HWASAN_SYMBOLIZER_PATH',
'MSAN_SYMBOLIZER_PATH', 'MSAN_SYMBOLIZER_PATH',
'TSAN_SYMBOLIZER_PATH', 'TSAN_SYMBOLIZER_PATH',
'UBSAN_SYMBOLIZER_PATH', 'UBSAN_SYMBOLIZER_PATH',
'ASAN_OPTIONS', 'ASAN_OPTIONS',
Show All 30 Lines