[clang-tidy] Rewrite compilation database test to not require shell

[zturner]

Summary

This allows the test to run on windows, and also makes writing compilation database tests easier in general. See D23532 for more information.

[alexfh]

test/clang-tidy/clang-tidy-run-with-database.cpp

11

This sed call substitutes placeholders with absolute paths, which is an important part of this test. So we can't get rid of the sed call. Furthermore, the test verifies that clang-tidy doesn't crash when applying fixes (which it used to, IIRC), so I'm not sure this change doesn't make the test less informative.

If you need to test correct handling of GCC-style command lines in JSON compilation databases on Windows, we can add another test, but this one should stay as it is.

36

Please fix "No newline at end of file".

test/clang-tidy/Inputs/compilation-database/a/a.cpp

+int *AA = 0;

test/clang-tidy/Inputs/compilation-database/a/b.cpp

+int *AB = 0;

test/clang-tidy/Inputs/compilation-database/b/b.cpp

+int *BB = 0;

test/clang-tidy/Inputs/compilation-database/b/c.cpp

+int *BC = 0;

test/clang-tidy/Inputs/compilation-database/b/d.cpp

+#include "header.h"

test/clang-tidy/Inputs/compilation-database/clang-tidy-database.json

+[
+{
+  "directory": "a",
+  "command": "clang++ -o test.o a.cpp",
+  "file": "a.cpp"
+},
+{
+  "directory": "a",
+  "command": "clang++ -o test.o b.cpp",
+  "file": "b.cpp"
+},
+{
+  "directory": "",
+  "command": "clang++ -o test.o b/b.cpp",
+  "file": "b/b.cpp"
+},
+{
+  "directory": "b",
+  "command": "clang++ -o test.o ../b/c.cpp",
+  "file": "c.cpp"
+},
+{
+  "directory": "b",
+  "command": "clang++ -I../include -o test.o ../b/d.cpp",
+  "file": "d.cpp"
+},
+{
+  "directory": "",
+  "command": "clang++ -o test.o b/not-exist.cpp",
+  "file": "not-exist.cpp"
+}
+]

test/clang-tidy/Inputs/compilation-database/include/header.h

+int *HP = 0;

test/clang-tidy/Inputs/compilation-database/template.json

-[
-{
-  "directory": "test_dir/a",
-  "command": "clang++ -o test.o test_dir/a/a.cpp",
-  "file": "test_dir/a/a.cpp"
-},
-{
-  "directory": "test_dir/a",
-  "command": "clang++ -o test.o test_dir/a/b.cpp",
-  "file": "test_dir/a/b.cpp"
-},
-{
-  "directory": "test_dir/",
-  "command": "clang++ -o test.o test_dir/b/b.cpp",
-  "file": "test_dir/b/b.cpp"
-},
-{
-  "directory": "test_dir/b",
-  "command": "clang++ -o test.o ../b/c.cpp",
-  "file": "test_dir/b/c.cpp"
-},
-{
-  "directory": "test_dir/b",
-  "command": "clang++ -I../include -o test.o ../b/d.cpp",
-  "file": "test_dir/b/d.cpp"
-},
-{
-  "directory": "test_dir/",
-  "command": "clang++ -o test.o test_dir/b/not-exist.cpp",
-  "file": "test_dir/b/not-exist.cpp"
-}
-]

test/clang-tidy/clang-tidy-run-with-database.cpp

-// REQUIRES: shell
-// RUN: mkdir -p %T/compilation-database-test/include
-// RUN: mkdir -p %T/compilation-database-test/a
-// RUN: mkdir -p %T/compilation-database-test/b
-// RUN: echo 'int *AA = 0;' > %T/compilation-database-test/a/a.cpp
-// RUN: echo 'int *AB = 0;' > %T/compilation-database-test/a/b.cpp
-// RUN: echo 'int *BB = 0;' > %T/compilation-database-test/b/b.cpp
-// RUN: echo 'int *BC = 0;' > %T/compilation-database-test/b/c.cpp
-// RUN: echo 'int *HP = 0;' > %T/compilation-database-test/include/header.h
-// RUN: echo '#include "header.h"' > %T/compilation-database-test/b/d.cpp
-// RUN: sed 's|test_dir|%T/compilation-database-test|g' %S/Inputs/compilation-database/template.json > %T/compile_commands.json
-// RUN: clang-tidy --checks=-*,modernize-use-nullptr -p %T %T/compilation-database-test/b/not-exist -header-filter=.*
-// RUN: clang-tidy --checks=-*,modernize-use-nullptr -p %T %T/compilation-database-test/a/a.cpp %T/compilation-database-test/a/b.cpp %T/compilation-database-test/b/b.cpp %T/compilation-database-test/b/c.cpp %T/compilation-database-test/b/d.cpp -header-filter=.* -fix
-// RUN: FileCheck -input-file=%T/compilation-database-test/a/a.cpp %s -check-prefix=CHECK-FIX1
-// RUN: FileCheck -input-file=%T/compilation-database-test/a/b.cpp %s -check-prefix=CHECK-FIX2
-// RUN: FileCheck -input-file=%T/compilation-database-test/b/b.cpp %s -check-prefix=CHECK-FIX3
-// RUN: FileCheck -input-file=%T/compilation-database-test/b/c.cpp %s -check-prefix=CHECK-FIX4
-// RUN: FileCheck -input-file=%T/compilation-database-test/include/header.h %s -check-prefix=CHECK-FIX5
+// RUN: clang-tidy --checks=-*,modernize-use-nullptr -p %S/Inputs/compilation-database/clang-tidy-database.json \
+// RUN: -r %S/Inputs/compilation-database %S/Inputs/compilation-database/a/a.cpp %S/Inputs/compilation-database/a/b.cpp \
+// RUN: %S/Inputs/compilation-database/b/b.cpp %S/Inputs/compilation-database/b/c.cpp %S/Inputs/compilation-database/b/d.cpp \
+// RUN: -header-filter=.* -export-fixes=%t.yaml > %t.msg 2>&1
+// RUN: FileCheck -input-file=%t.msg -check-prefix=CHECK-MESSAGES %s
+// RUN: FileCheck -input-file=%t.yaml -check-prefix=CHECK-YAML %s
 
-// CHECK-FIX1: int *AA = nullptr;
-// CHECK-FIX2: int *AB = nullptr;
-// CHECK-FIX3: int *BB = nullptr;
-// CHECK-FIX4: int *BC = nullptr;
-// CHECK-FIX5: int *HP = nullptr;
+// CHECK-MESSAGES: int *AA = 0;
+// CHECK-MESSAGES: int *AB = 0;
+// CHECK-MESSAGES: int *BB = 0;
+// CHECK-MESSAGES: int *BC = 0;
+// CHECK-MESSAGES: int *HP = 0;
+
+// CHECK-YAML: MainSourceFile:  ''
+// CHECK-YAML: Replacements:
+// CHECK-YAML:   - FilePath:        a.cpp
+// CHECK-YAML:     Offset:          10
+// CHECK-YAML:     Length:          1
+// CHECK-YAML:     ReplacementText: nullptr
+// CHECK-YAML:   - FilePath:        b.cpp
+// CHECK-YAML:     Offset:          10
+// CHECK-YAML:     Length:          1
+// CHECK-YAML:     ReplacementText: nullptr
+// CHECK-YAML:   - FilePath:        b{{[/\\]}}b.cpp
+// CHECK-YAML:     Offset:          10
+// CHECK-YAML:     Length:          1
+// CHECK-YAML:     ReplacementText: nullptr
+// CHECK-YAML:   - FilePath:        ..{{[/\\]}}b{{[/\\]}}c.cpp
+// CHECK-YAML:     Offset:          10
+// CHECK-YAML:     Length:          1
+// CHECK-YAML:     ReplacementText: nullptr
+// CHECK-YAML:   - FilePath:        '..{{[/\\]}}include{{[/\\]}}header.h'
+// CHECK-YAML:     Offset:          10
+// CHECK-YAML:     Length:          1
+// CHECK-YAML:     ReplacementText: nullptr
 No newline at end of file