[llvm] 285ec53 - [clang][deps] Move tests to the Clang subdirectory

[Jan Svoboda via llvm-commits]

Author: Jan Svoboda
Date: 2021-09-10T21:36:49+02:00
New Revision: 285ec53730ce6dfecd2a4288388e6ba4f2bd17e4

URL: https://github.com/llvm/llvm-project/commit/285ec53730ce6dfecd2a4288388e6ba4f2bd17e4
DIFF: https://github.com/llvm/llvm-project/commit/285ec53730ce6dfecd2a4288388e6ba4f2bd17e4.diff

LOG: [clang][deps] Move tests to the Clang subdirectory

Added: 
    clang/test/ClangScanDeps/Inputs/diagnostics/cdb.json.template
    clang/test/ClangScanDeps/Inputs/diagnostics/mod.h
    clang/test/ClangScanDeps/Inputs/diagnostics/module.modulemap
    clang/test/ClangScanDeps/Inputs/diagnostics/tu.c
    clang/test/ClangScanDeps/diagnostics.c

Modified: 
    

Removed: 
    llvm/clang/test/ClangScanDeps/Inputs/diagnostics/cdb.json.template
    llvm/clang/test/ClangScanDeps/Inputs/diagnostics/mod.h
    llvm/clang/test/ClangScanDeps/Inputs/diagnostics/module.modulemap
    llvm/clang/test/ClangScanDeps/Inputs/diagnostics/tu.c
    llvm/clang/test/ClangScanDeps/diagnostics.c


################################################################################
diff  --git a/llvm/clang/test/ClangScanDeps/Inputs/diagnostics/cdb.json.template b/clang/test/ClangScanDeps/Inputs/diagnostics/cdb.json.template
similarity index 63%
rename from llvm/clang/test/ClangScanDeps/Inputs/diagnostics/cdb.json.template
rename to clang/test/ClangScanDeps/Inputs/diagnostics/cdb.json.template
index a33fabbb958c5..062e202328c86 100644
--- a/llvm/clang/test/ClangScanDeps/Inputs/diagnostics/cdb.json.template
+++ b/clang/test/ClangScanDeps/Inputs/diagnostics/cdb.json.template
@@ -1,7 +1,7 @@
 [
   {
     "directory": "DIR",
-    "command": "clang -c DIR/tu.c -fmodules -target i386-apple-ios14.0-simulator -o DIR/tu.o",
+    "command": "clang -c DIR/tu.c -fmodules -target i386-apple-ios14.0-simulator -Wno-error=invalid-ios-deployment-target -o DIR/tu.o",
     "file": "DIR/tu.c"
   }
 ]

diff  --git a/llvm/clang/test/ClangScanDeps/Inputs/diagnostics/mod.h b/clang/test/ClangScanDeps/Inputs/diagnostics/mod.h
similarity index 100%
rename from llvm/clang/test/ClangScanDeps/Inputs/diagnostics/mod.h
rename to clang/test/ClangScanDeps/Inputs/diagnostics/mod.h

diff  --git a/llvm/clang/test/ClangScanDeps/Inputs/diagnostics/module.modulemap b/clang/test/ClangScanDeps/Inputs/diagnostics/module.modulemap
similarity index 100%
rename from llvm/clang/test/ClangScanDeps/Inputs/diagnostics/module.modulemap
rename to clang/test/ClangScanDeps/Inputs/diagnostics/module.modulemap

diff  --git a/llvm/clang/test/ClangScanDeps/Inputs/diagnostics/tu.c b/clang/test/ClangScanDeps/Inputs/diagnostics/tu.c
similarity index 100%
rename from llvm/clang/test/ClangScanDeps/Inputs/diagnostics/tu.c
rename to clang/test/ClangScanDeps/Inputs/diagnostics/tu.c

diff  --git a/llvm/clang/test/ClangScanDeps/diagnostics.c b/clang/test/ClangScanDeps/diagnostics.c
similarity index 90%
rename from llvm/clang/test/ClangScanDeps/diagnostics.c
rename to clang/test/ClangScanDeps/diagnostics.c
index e82bdccb88c4b..ce4eff79dc02b 100644
--- a/llvm/clang/test/ClangScanDeps/diagnostics.c
+++ b/clang/test/ClangScanDeps/diagnostics.c
@@ -6,8 +6,9 @@
 // RUN: clang-scan-deps -compilation-database %t/cdb.json -format experimental-full 2>&1 >> %t/result.json
 // RUN: cat %t/result.json | sed 's:\\\\\?:/:g' | FileCheck %s
 
-// Check that the scanner injects '-Wno-error' option and invalid command-line
-// arguments like '-target i386-apple-ios14.0-simulator' do not result in error.
+// Check that the '-Wno-error=invalid-ios-deployment-target' option is being
+// respected and invalid arguments like '-target i386-apple-ios14.0-simulator'
+// do not result in an error.
 
 // CHECK-NOT:  error:
 // CHECK:      -[[PREFIX:.*]]