This is an archive of the discontinued LLVM Phabricator instance.

Differential D41545

Replace cp -a in various Clang tests
ClosedPublic

Authored by hubert.reinterpretcast on Dec 22 2017, 9:21 AM.

Details

Reviewers
bruno
Commits
rG8fbad0a4c208: Replace cp -a in various Clang tests
rL321778: Replace cp -a in various Clang tests
rC321778: Replace cp -a in various Clang tests
Summary

cp -a is neither part of POSIX nor the LSB. The nearest equivalent under POSIX is cp -RPp; however, cp -R is sufficient for the intended purpose.

test/Modules/crash-vfs-headermaps.m is not updated since it requires system-darwin anyway.

Diff Detail

Event Timeline

hubert.reinterpretcast created this revision.Dec 22 2017, 9:21 AM
Harbormaster completed remote builds in B13395: Diff 128037.Dec 22 2017, 9:21 AM
hubert.reinterpretcast added a comment.Dec 29 2017, 10:43 AM

Maybe cp -R is sufficient? cp -RPp was the just-to-be-safe "minimal change".

bruno accepted this revision.Jan 2 2018, 3:55 PM
bruno added a subscriber: bruno.

Hi Hubert,

Thanks for fixing this. cp -R is sufficient IMO. LGTM

This revision is now accepted and ready to land.Jan 2 2018, 3:55 PM
hubert.reinterpretcast added a comment.Jan 2 2018, 6:45 PM

I'll commit with cp -R tomorrow then; thanks.

hubert.reinterpretcast updated this revision to Diff 128584.Jan 3 2018, 5:10 PM

Use cp -R, which is sufficient instead of cp -RPp

Harbormaster completed remote builds in B13505: Diff 128584.Jan 3 2018, 5:10 PM
hubert.reinterpretcast edited the summary of this revision. (Show Details)Jan 3 2018, 5:12 PM
Closed by commit rC321778: Replace cp -a in various Clang tests (authored by hubert.reinterpretcast). · Explain WhyJan 3 2018, 5:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 128037

test/Modules/crash-vfs-path-emptydir-entries.m

// REQUIRES: crash-recovery, shell // REQUIRES: crash-recovery, shell
// FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it? // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
// XFAIL: mingw32 // XFAIL: mingw32
// Test clang can collect symbolic link headers used in modules. // Test clang can collect symbolic link headers used in modules.
// crash reproducer if there's a symbolic link header file used in a module. // crash reproducer if there's a symbolic link header file used in a module.
// RUN: rm -rf %t // RUN: rm -rf %t
// RUN: mkdir -p %t/i %t/m %t %t/sysroot // RUN: mkdir -p %t/i %t/m %t %t/sysroot
// RUN: cp -a %S/Inputs/crash-recovery/usr %t/i/ // RUN: cp -RPp %S/Inputs/crash-recovery/usr %t/i/
// RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \ // RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \
// RUN: %clang -fsyntax-only %s -I %/t/i -isysroot %/t/sysroot/ \ // RUN: %clang -fsyntax-only %s -I %/t/i -isysroot %/t/sysroot/ \
// RUN: -fmodules -fmodules-cache-path=%t/m/ 2>&1 | FileCheck %s // RUN: -fmodules -fmodules-cache-path=%t/m/ 2>&1 | FileCheck %s
// RUN: FileCheck --check-prefix=CHECKSRC %s -input-file %t/crash-vfs-*.m // RUN: FileCheck --check-prefix=CHECKSRC %s -input-file %t/crash-vfs-*.m
// RUN: FileCheck --check-prefix=CHECKSH %s -input-file %t/crash-vfs-*.sh // RUN: FileCheck --check-prefix=CHECKSH %s -input-file %t/crash-vfs-*.sh
// RUN: FileCheck --check-prefix=CHECKYAML %s -input-file \ // RUN: FileCheck --check-prefix=CHECKYAML %s -input-file \
Show All 30 Lines

test/Modules/crash-vfs-path-symlink-component.m

// REQUIRES: crash-recovery, shell // REQUIRES: crash-recovery, shell
// FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it? // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
// XFAIL: mingw32 // XFAIL: mingw32
// Test that clang is capable of collecting the right header files in the // Test that clang is capable of collecting the right header files in the
// crash reproducer if there's a symbolic link component in the path. // crash reproducer if there's a symbolic link component in the path.
// RUN: rm -rf %t // RUN: rm -rf %t
// RUN: mkdir -p %t/i %t/m %t %t/sysroot // RUN: mkdir -p %t/i %t/m %t %t/sysroot
// RUN: cp -a %S/Inputs/crash-recovery/usr %t/i/ // RUN: cp -RPp %S/Inputs/crash-recovery/usr %t/i/
// RUN: ln -s include/tcl-private %t/i/usr/x // RUN: ln -s include/tcl-private %t/i/usr/x
// RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \ // RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \
// RUN: %clang -fsyntax-only %s -I %/t/i -isysroot %/t/sysroot/ \ // RUN: %clang -fsyntax-only %s -I %/t/i -isysroot %/t/sysroot/ \
// RUN: -fmodules -fmodules-cache-path=%t/m/ 2>&1 | FileCheck %s // RUN: -fmodules -fmodules-cache-path=%t/m/ 2>&1 | FileCheck %s
// RUN: FileCheck --check-prefix=CHECKSRC %s -input-file %t/crash-vfs-*.m // RUN: FileCheck --check-prefix=CHECKSRC %s -input-file %t/crash-vfs-*.m
// RUN: FileCheck --check-prefix=CHECKSH %s -input-file %t/crash-vfs-*.sh // RUN: FileCheck --check-prefix=CHECKSH %s -input-file %t/crash-vfs-*.sh
▲ Show 20 Lines • Show All 49 Lines • Show Last 20 Lines

test/Modules/crash-vfs-path-symlink-topheader.m

// REQUIRES: crash-recovery, shell // REQUIRES: crash-recovery, shell
// FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it? // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
// XFAIL: mingw32 // XFAIL: mingw32
// Test clang can collect symbolic link headers used in modules. // Test clang can collect symbolic link headers used in modules.
// crash reproducer if there's a symbolic link header file used in a module. // crash reproducer if there's a symbolic link header file used in a module.
// RUN: rm -rf %t // RUN: rm -rf %t
// RUN: mkdir -p %t/i %t/m %t %t/sysroot // RUN: mkdir -p %t/i %t/m %t %t/sysroot
// RUN: cp -a %S/Inputs/crash-recovery/usr %t/i/ // RUN: cp -RPp %S/Inputs/crash-recovery/usr %t/i/
// RUN: rm -f %t/i/usr/include/pthread_impl.h // RUN: rm -f %t/i/usr/include/pthread_impl.h
// RUN: ln -s pthread/pthread_impl.h %t/i/usr/include/pthread_impl.h // RUN: ln -s pthread/pthread_impl.h %t/i/usr/include/pthread_impl.h
// RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \ // RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \
// RUN: %clang -fsyntax-only %s -I %/t/i -isysroot %/t/sysroot/ \ // RUN: %clang -fsyntax-only %s -I %/t/i -isysroot %/t/sysroot/ \
// RUN: -fmodules -fmodules-cache-path=%t/m/ 2>&1 | FileCheck %s // RUN: -fmodules -fmodules-cache-path=%t/m/ 2>&1 | FileCheck %s
// RUN: FileCheck --check-prefix=CHECKSRC %s -input-file %t/crash-vfs-*.m // RUN: FileCheck --check-prefix=CHECKSRC %s -input-file %t/crash-vfs-*.m
Show All 32 Lines

test/Modules/crash-vfs-umbrella-frameworks.m

// REQUIRES: crash-recovery, shell // REQUIRES: crash-recovery, shell
// FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it? // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
// XFAIL: mingw32 // XFAIL: mingw32
// RUN: rm -rf %t // RUN: rm -rf %t
// RUN: mkdir -p %t/i %t/m %t // RUN: mkdir -p %t/i %t/m %t
// RUN: cp -a %S/Inputs/crash-recovery/Frameworks %t/i/ // RUN: cp -RPp %S/Inputs/crash-recovery/Frameworks %t/i/
// RUN: mkdir -p %t/i/Frameworks/A.framework/Frameworks // RUN: mkdir -p %t/i/Frameworks/A.framework/Frameworks
// RUN: ln -s ../../B.framework %t/i/Frameworks/A.framework/Frameworks/B.framework // RUN: ln -s ../../B.framework %t/i/Frameworks/A.framework/Frameworks/B.framework
// RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \ // RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \
// RUN: %clang -nostdinc -fsyntax-only %s \ // RUN: %clang -nostdinc -fsyntax-only %s \
// RUN: -F %/t/i/Frameworks -fmodules \ // RUN: -F %/t/i/Frameworks -fmodules \
// RUN: -fmodules-cache-path=%t/m/ 2>&1 | FileCheck %s // RUN: -fmodules-cache-path=%t/m/ 2>&1 | FileCheck %s
Show All 39 Lines

test/VFS/umbrella-framework-import-skipnonexist.m

// REQUIRES: crash-recovery, shell // REQUIRES: crash-recovery, shell
// FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it? // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
// XFAIL: mingw32 // XFAIL: mingw32
// RUN: rm -rf %t // RUN: rm -rf %t
// RUN: mkdir -p %t/vdir %t/outdir %t/cache // RUN: mkdir -p %t/vdir %t/outdir %t/cache
// RUN: cp -a %S/Inputs/Bar.framework %t/outdir/ // RUN: cp -RPp %S/Inputs/Bar.framework %t/outdir/
// //
// RUN: sed -e "s:VDIR:%t/vdir:g" -e "s:OUT_DIR:%t/outdir:g" %S/Inputs/bar-headers.yaml > %t/vdir/bar-headers.yaml // RUN: sed -e "s:VDIR:%t/vdir:g" -e "s:OUT_DIR:%t/outdir:g" %S/Inputs/bar-headers.yaml > %t/vdir/bar-headers.yaml
// RUN: rm -f %t/outdir/Bar.framework/Headers/B.h // RUN: rm -f %t/outdir/Bar.framework/Headers/B.h
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -ivfsoverlay %t/vdir/bar-headers.yaml -F %t/vdir -fsyntax-only %s // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -ivfsoverlay %t/vdir/bar-headers.yaml -F %t/vdir -fsyntax-only %s
@import Bar; @import Bar;