From: Reid Kleckner Date: Mon, 2 Mar 2015 22:42:58 +0000 (+0000) Subject: Remove shell requirements from tests that use 'cd' X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fec792a0af1e2c79c42a69927467edac4343d429;p=clang Remove shell requirements from tests that use 'cd' Modules and Tooling tests in particular tend to want to change the cwd, so we were missing test coverage in this area on Windows. It should now be easier to write such portable tests. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@231029 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/Analysis/html-diags.c b/test/Analysis/html-diags.c index 1b01783d5d..e998020f4c 100644 --- a/test/Analysis/html-diags.c +++ b/test/Analysis/html-diags.c @@ -8,8 +8,6 @@ // RUN: %clang_cc1 -analyze -analyzer-output=html -analyzer-checker=core -o testrelative %s // RUN: ls %T/dir/testrelative | grep report -// REQUIRES: shell - // Currently this test mainly checks that the HTML diagnostics doesn't crash // when handling macros will calls with macros. We should actually validate // the output, but that requires being able to match against a specifically diff --git a/test/Driver/debug-comp-dir.S b/test/Driver/debug-comp-dir.S index daf895c18a..5bf3b9295a 100644 --- a/test/Driver/debug-comp-dir.S +++ b/test/Driver/debug-comp-dir.S @@ -1,8 +1,2 @@ // RUN: cd %S && %clang -### -g %s -c 2>&1 | FileCheck -check-prefix=CHECK-PWD %s // CHECK-PWD: {{"-fdebug-compilation-dir" ".*Driver.*"}} - -// "PWD=/foo gcc" wouldn't necessarily work. You would need to pick a different -// path to the same directory (try a symlink). - -// This depends on host's behavior how $PWD would be set. -// REQUIRES: shell diff --git a/test/Driver/debug.c b/test/Driver/debug.c index daf895c18a..5bf3b9295a 100644 --- a/test/Driver/debug.c +++ b/test/Driver/debug.c @@ -1,8 +1,2 @@ // RUN: cd %S && %clang -### -g %s -c 2>&1 | FileCheck -check-prefix=CHECK-PWD %s // CHECK-PWD: {{"-fdebug-compilation-dir" ".*Driver.*"}} - -// "PWD=/foo gcc" wouldn't necessarily work. You would need to pick a different -// path to the same directory (try a symlink). - -// This depends on host's behavior how $PWD would be set. -// REQUIRES: shell diff --git a/test/Driver/output-file-cleanup.c b/test/Driver/output-file-cleanup.c index 0aee5f8fa9..065df8f5b8 100644 --- a/test/Driver/output-file-cleanup.c +++ b/test/Driver/output-file-cleanup.c @@ -13,7 +13,6 @@ // RUN: test ! -f %t.s // RUN: test -f %t.d -// REQUIRES: shell // REQUIRES: crash-recovery #ifdef CRASH diff --git a/test/Frontend/dependency-gen-escaping.c b/test/Frontend/dependency-gen-escaping.c index 84eb242ec3..551df98958 100644 --- a/test/Frontend/dependency-gen-escaping.c +++ b/test/Frontend/dependency-gen-escaping.c @@ -1,4 +1,3 @@ -// REQUIRES: shell // PR15642 // RUN: rm -rf %t.dir // RUN: mkdir -p %t.dir diff --git a/test/Frontend/dependency-gen.c b/test/Frontend/dependency-gen.c index 5883ec5586..0465dc864e 100644 --- a/test/Frontend/dependency-gen.c +++ b/test/Frontend/dependency-gen.c @@ -1,4 +1,3 @@ -// REQUIRES: shell // Basic test // RUN: rm -rf %t.dir // RUN: mkdir -p %t.dir/a/b diff --git a/test/Frontend/print-header-includes.c b/test/Frontend/print-header-includes.c index 6fde00cbbe..966b4af860 100644 --- a/test/Frontend/print-header-includes.c +++ b/test/Frontend/print-header-includes.c @@ -1,5 +1,3 @@ -// REQUIRES: shell - // RUN: cd %S // RUN: %clang_cc1 -include Inputs/test3.h -E -H -o %t.out %s 2> %t.stderr // RUN: FileCheck < %t.stderr %s diff --git a/test/Modules/dependency-gen.modulemap b/test/Modules/dependency-gen.modulemap index 5cb8a4dba9..6aa2e007eb 100644 --- a/test/Modules/dependency-gen.modulemap +++ b/test/Modules/dependency-gen.modulemap @@ -1,5 +1,3 @@ -// REQUIRES: shell -// // RUN: cd %S // RUN: rm -f %t.cpm %t-base.pcm %t-base.d %t.d // RUN: %clang_cc1 -I. -x c++ -fmodule-maps -fmodule-name=test-base -fno-modules-implicit-maps -fmodules -emit-module -fno-validate-pch -fmodules-strict-decluse Inputs/dependency-gen-base.modulemap -dependency-file %t-base.d -MT %t-base.pcm -o %t-base.pcm -fmodule-map-file-home-is-cwd @@ -14,5 +12,5 @@ module "test" { extern module "test-base2" "Inputs/dependency-gen-base2.modulemap" extern module "test-base" "Inputs/dependency-gen-base.modulemap" -// CHECK: {{ |\./}}Inputs/dependency-gen-included2.h -// CHECK: {{ |\./}}Inputs/dependency-gen-base.modulemap +// CHECK: {{ |\.[/\\]}}Inputs{{[/\\]}}dependency-gen-included2.h +// CHECK: {{ |\.[/\\]}}Inputs{{[/\\]}}dependency-gen-base.modulemap diff --git a/test/Modules/explicit-build-relpath.cpp b/test/Modules/explicit-build-relpath.cpp index d9c15660b6..1defdb2a84 100644 --- a/test/Modules/explicit-build-relpath.cpp +++ b/test/Modules/explicit-build-relpath.cpp @@ -2,7 +2,6 @@ // // RUN: rm -rf %t // RUN: mkdir %t -// RUN: cd %t // ---------------------- // Build modules A and B. diff --git a/test/Modules/filename.cpp b/test/Modules/filename.cpp index 66891a04b7..460b6e6b95 100644 --- a/test/Modules/filename.cpp +++ b/test/Modules/filename.cpp @@ -1,6 +1,5 @@ // RUN: cd %S // RUN: %clang_cc1 -I. -fmodule-maps -fmodule-name=A -fmodule-map-file=%S/Inputs/filename/module.map %s -E | FileCheck %s -// REQUIRES: shell #include "Inputs/filename/a.h" diff --git a/test/Modules/include-relative.c b/test/Modules/include-relative.c index 9ca76eeb92..264df5f318 100644 --- a/test/Modules/include-relative.c +++ b/test/Modules/include-relative.c @@ -3,7 +3,6 @@ // RUN: cp -r %S/Inputs/include-relative %t/include-relative // RUN: cd %t // RUN: %clang_cc1 -fmodules -x c -verify -fmodules-cache-path=%t -I include-relative %s -// REQUIRES: shell // expected-no-diagnostics diff --git a/test/Modules/malformed.cpp b/test/Modules/malformed.cpp index 2554c3a872..2d07c4cd0d 100644 --- a/test/Modules/malformed.cpp +++ b/test/Modules/malformed.cpp @@ -1,8 +1,6 @@ // This test explicitly cd's to the test/Modules directory so that we can test // that filenames found via relative -I paths are printed correctly. // -// REQUIRES: shell -// // RUN: rm -rf %t // RUN: cd %S // RUN: not %clang_cc1 -fmodules -fmodules-cache-path=%t -I Inputs/malformed -DHEADER="a1.h" %s 2>&1 | FileCheck %s --check-prefix=CHECK-A @@ -32,6 +30,6 @@ void test() { f(); } // Test that we use relative paths to name files within an imported module. // -// CHECK-C: In module 'c' imported from malformed.cpp:14: +// CHECK-C: In module 'c' imported from malformed.cpp:12: // CHECK-C: {{^}}Inputs/malformed/c.h:1:33: error: type 'int' cannot be used prior to '::' // CHECK-C: {{^}}malformed.cpp:[[@LINE-5]]:15: note: in instantiation of diff --git a/test/Modules/modular_maps.cpp b/test/Modules/modular_maps.cpp index 606c979c4c..bedf2e02fb 100644 --- a/test/Modules/modular_maps.cpp +++ b/test/Modules/modular_maps.cpp @@ -11,9 +11,6 @@ // RUN: %clang_cc1 -x objective-c++ -fmodules-cache-path=%t -fmodules -fmodule-map-file=Inputs/modular_maps/modulea-cwd.map -fmodule-map-file=Inputs/modular_maps/modulec-cwd.map -I Inputs/modular_maps %s -verify -fmodule-map-file-home-is-cwd // RxN: %clang_cc1 -x objective-c++ -fmodules-cache-path=%t -fmodules -fmodule-map-file=Inputs/modular_maps/modulec-cwd.map -fmodule-map-file=Inputs/modular_maps/modulea-cwd.map -I Inputs/modular_maps %s -verify -fmodule-map-file-home-is-cwd -// chdir is unsupported on Lit internal runner. -// REQUIRES: shell - #include "common.h" #include "a.h" #include "b.h" // expected-error {{private header}} diff --git a/test/Modules/relative-dep-gen.cpp b/test/Modules/relative-dep-gen.cpp index c817177715..1aa4e2a382 100644 --- a/test/Modules/relative-dep-gen.cpp +++ b/test/Modules/relative-dep-gen.cpp @@ -1,5 +1,3 @@ -// REQUIRES: shell -// // RUN: cd %S // RUN: rm -rf %t // RUN: mkdir %t diff --git a/test/PCH/headersearch.cpp b/test/PCH/headersearch.cpp index 736ba1925a..950b481b74 100644 --- a/test/PCH/headersearch.cpp +++ b/test/PCH/headersearch.cpp @@ -1,6 +1,5 @@ // Test reading of PCH with changed location of original input files, // i.e. invoking header search. -// REQUIRES: shell // Generate the original files: // RUN: rm -rf %t_orig %t_moved