Rename directory housing clang-include-fixer to be eponymous

Makes the name of this directory consistent with the names of the other
directories in clang-tools-extra.

Similar to r356254. No intended behavior change.

Differential Revision: https://reviews.llvm.org/D59750

llvm-svn: 356897

18 files changed, 35 insertions, 35 deletions

diff --git a/clang-tools-extra/test/include-fixer/Inputs/database_template.json b/clang-tools-extra/test/clang-include-fixer/Inputs/database_template.json
index ec71c56226e..ec71c56226e 100644
--- a/clang-tools-extra/test/include-fixer/Inputs/database_template.json
+++ b/clang-tools-extra/test/clang-include-fixer/Inputs/database_template.json
diff --git a/clang-tools-extra/test/include-fixer/Inputs/fake_yaml_db.yaml b/clang-tools-extra/test/clang-include-fixer/Inputs/fake_yaml_db.yaml
index b599005e2c3..134b3758b74 100644
--- a/clang-tools-extra/test/include-fixer/Inputs/fake_yaml_db.yaml
+++ b/clang-tools-extra/test/clang-include-fixer/Inputs/fake_yaml_db.yaml
@@ -65,7 +65,7 @@ Name:            bar
 Contexts:
   - ContextType:    Namespace
     ContextName:    c
-FilePath:        test/include-fixer/baz.h
+FilePath:        test/clang-include-fixer/baz.h
 Type:            Class
 Seen:            1
 Used:            0
diff --git a/clang-tools-extra/test/include-fixer/Inputs/merge/a.yaml b/clang-tools-extra/test/clang-include-fixer/Inputs/merge/a.yaml
index 174db0e5430..174db0e5430 100644
--- a/clang-tools-extra/test/include-fixer/Inputs/merge/a.yaml
+++ b/clang-tools-extra/test/clang-include-fixer/Inputs/merge/a.yaml
diff --git a/clang-tools-extra/test/include-fixer/Inputs/merge/b.yaml b/clang-tools-extra/test/clang-include-fixer/Inputs/merge/b.yaml
index 86893208113..86893208113 100644
--- a/clang-tools-extra/test/include-fixer/Inputs/merge/b.yaml
+++ b/clang-tools-extra/test/clang-include-fixer/Inputs/merge/b.yaml
diff --git a/clang-tools-extra/test/include-fixer/commandline_options.cpp b/clang-tools-extra/test/clang-include-fixer/commandline_options.cpp
index 3cc77b49569..3cc77b49569 100644
--- a/clang-tools-extra/test/include-fixer/commandline_options.cpp
+++ b/clang-tools-extra/test/clang-include-fixer/commandline_options.cpp
diff --git a/clang-tools-extra/test/include-fixer/exit_on_fatal.cpp b/clang-tools-extra/test/clang-include-fixer/exit_on_fatal.cpp
index fc8c95a0371..fc8c95a0371 100644
--- a/clang-tools-extra/test/include-fixer/exit_on_fatal.cpp
+++ b/clang-tools-extra/test/clang-include-fixer/exit_on_fatal.cpp
diff --git a/clang-tools-extra/test/include-fixer/fixeddb.cpp b/clang-tools-extra/test/clang-include-fixer/fixeddb.cpp
index 90068dbfde1..90068dbfde1 100644
--- a/clang-tools-extra/test/include-fixer/fixeddb.cpp
+++ b/clang-tools-extra/test/clang-include-fixer/fixeddb.cpp
diff --git a/clang-tools-extra/test/clang-include-fixer/include_path.cpp b/clang-tools-extra/test/clang-include-fixer/include_path.cpp
new file mode 100644
index 00000000000..9185b7af517
--- /dev/null
+++ b/clang-tools-extra/test/clang-include-fixer/include_path.cpp
@@ -0,0 +1,19 @@
+// RUN: mkdir -p %T/clang-include-fixer/include
+// RUN: mkdir -p %T/clang-include-fixer/symbols
+// RUN: mkdir -p %T/clang-include-fixer/build
+// RUN: mkdir -p %T/clang-include-fixer/src
+// RUN: sed 's|test_dir|%/T/clang-include-fixer|g' %S/Inputs/database_template.json > %T/clang-include-fixer/build/compile_commands.json
+// RUN: echo -e '#include "bar.h"\nb::a::bar f;' > %T/clang-include-fixer/src/bar.cpp
+// RUN: echo 'namespace b { namespace a { class bar {}; } }' > %T/clang-include-fixer/include/bar.h
+// RUN: cd %T/clang-include-fixer/build
+// RUN: find-all-symbols -output-dir=%T/clang-include-fixer/symbols -p=. %T/clang-include-fixer/src/bar.cpp
+// RUN: find-all-symbols -merge-dir=%T/clang-include-fixer/symbols %T/clang-include-fixer/build/find_all_symbols.yaml
+// RUN: FileCheck -input-file=%T/clang-include-fixer/build/find_all_symbols.yaml -check-prefix=CHECK-YAML %s
+//
+// RUN: echo 'b::a::bar f;' > %T/clang-include-fixer/src/bar.cpp
+// RUN: clang-include-fixer -db=yaml -input=%T/clang-include-fixer/build/find_all_symbols.yaml -minimize-paths=true -p=. %T/clang-include-fixer/src/bar.cpp
+// RUN: FileCheck -input-file=%T/clang-include-fixer/src/bar.cpp %s
+
+// CHECK-YAML: ..{{[/\\]}}include{{[/\\]}}bar.h
+// CHECK: #include "bar.h"
+// CHECK: b::a::bar f;
diff --git a/clang-tools-extra/test/include-fixer/merge.test b/clang-tools-extra/test/clang-include-fixer/merge.test
index 230d38da77e..230d38da77e 100644
--- a/clang-tools-extra/test/include-fixer/merge.test
+++ b/clang-tools-extra/test/clang-include-fixer/merge.test
diff --git a/clang-tools-extra/test/clang-include-fixer/multiple_fixes.cpp b/clang-tools-extra/test/clang-include-fixer/multiple_fixes.cpp
new file mode 100644
index 00000000000..791417a3682
--- /dev/null
+++ b/clang-tools-extra/test/clang-include-fixer/multiple_fixes.cpp
@@ -0,0 +1,13 @@
+// REQUIRES: shell
+// RUN: sed -e 's#//.*$##' %s > %t.cpp
+// RUN: mkdir -p %T/clang-include-fixer/multiple-fixes
+// RUN: echo 'foo f;' > %T/clang-include-fixer/multiple-fixes/foo.cpp
+// RUN: echo 'bar b;' > %T/clang-include-fixer/multiple-fixes/bar.cpp
+// RUN: clang-include-fixer -db=fixed -input='foo= "foo.h";bar= "bar.h"' %T/clang-include-fixer/multiple-fixes/*.cpp --
+// RUN: FileCheck -input-file=%T/clang-include-fixer/multiple-fixes/bar.cpp %s -check-prefix=CHECK-BAR
+// RUN: FileCheck -input-file=%T/clang-include-fixer/multiple-fixes/foo.cpp %s -check-prefix=CHECK-FOO
+//
+// CHECK-FOO: #include "foo.h"
+// CHECK-FOO: foo f;
+// CHECK-BAR: #include "bar.h"
+// CHECK-BAR: bar b;
diff --git a/clang-tools-extra/test/include-fixer/prefix_variable.cpp b/clang-tools-extra/test/clang-include-fixer/prefix_variable.cpp
index b39cdb8d38d..b39cdb8d38d 100644
--- a/clang-tools-extra/test/include-fixer/prefix_variable.cpp
+++ b/clang-tools-extra/test/clang-include-fixer/prefix_variable.cpp
diff --git a/clang-tools-extra/test/include-fixer/query_symbol.cpp b/clang-tools-extra/test/clang-include-fixer/query_symbol.cpp
index 84c3a2373bd..84c3a2373bd 100644
--- a/clang-tools-extra/test/include-fixer/query_symbol.cpp
+++ b/clang-tools-extra/test/clang-include-fixer/query_symbol.cpp
diff --git a/clang-tools-extra/test/include-fixer/ranking.cpp b/clang-tools-extra/test/clang-include-fixer/ranking.cpp
index 2dabe16fa63..ee54d4c7ee9 100644
--- a/clang-tools-extra/test/include-fixer/ranking.cpp
+++ b/clang-tools-extra/test/clang-include-fixer/ranking.cpp
@@ -2,7 +2,7 @@
 // RUN: clang-include-fixer -query-symbol bar -db=yaml -input=%S/Inputs/fake_yaml_db.yaml -output-headers %s -- | FileCheck %s
 
 // CHECK:     "HeaderInfos": [
-// CHECK-NEXT:  {"Header": "\"test/include-fixer/baz.h\"",
+// CHECK-NEXT:  {"Header": "\"test/clang-include-fixer/baz.h\"",
 // CHECK-NEXT:   "QualifiedName": "c::bar"},
 // CHECK-NEXT:  {"Header": "\"../include/bar.h\"",
 // CHECK-NEXT:   "QualifiedName": "b::a::bar"},
diff --git a/clang-tools-extra/test/include-fixer/yaml_fuzzy.cpp b/clang-tools-extra/test/clang-include-fixer/yaml_fuzzy.cpp
index 705542dd0d1..9a3daacb825 100644
--- a/clang-tools-extra/test/include-fixer/yaml_fuzzy.cpp
+++ b/clang-tools-extra/test/clang-include-fixer/yaml_fuzzy.cpp
@@ -2,7 +2,7 @@
 // RUN: clang-include-fixer -db=fuzzyYaml -input=%p/Inputs/fake_yaml_db.yaml %t.cpp --
 // RUN: FileCheck %s -input-file=%t.cpp
 
-// include-fixer will add the include, but doesn't complete the symbol.
+// clang-include-fixer will add the include, but doesn't complete the symbol.
 // CHECK: #include "foobar.h"
 // CHECK: fba f;
 
diff --git a/clang-tools-extra/test/include-fixer/yamldb.cpp b/clang-tools-extra/test/clang-include-fixer/yamldb.cpp
index d17b41472b2..d17b41472b2 100644
--- a/clang-tools-extra/test/include-fixer/yamldb.cpp
+++ b/clang-tools-extra/test/clang-include-fixer/yamldb.cpp
diff --git a/clang-tools-extra/test/include-fixer/yamldb_autodetect.cpp b/clang-tools-extra/test/clang-include-fixer/yamldb_autodetect.cpp
index 1997390d5a2..1997390d5a2 100644
--- a/clang-tools-extra/test/include-fixer/yamldb_autodetect.cpp
+++ b/clang-tools-extra/test/clang-include-fixer/yamldb_autodetect.cpp
diff --git a/clang-tools-extra/test/include-fixer/include_path.cpp b/clang-tools-extra/test/include-fixer/include_path.cpp
deleted file mode 100644
index 28b6ace5f59..00000000000
--- a/clang-tools-extra/test/include-fixer/include_path.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// RUN: mkdir -p %T/include-fixer/include
-// RUN: mkdir -p %T/include-fixer/symbols
-// RUN: mkdir -p %T/include-fixer/build
-// RUN: mkdir -p %T/include-fixer/src
-// RUN: sed 's|test_dir|%/T/include-fixer|g' %S/Inputs/database_template.json > %T/include-fixer/build/compile_commands.json
-// RUN: echo -e '#include "bar.h"\nb::a::bar f;' > %T/include-fixer/src/bar.cpp
-// RUN: echo 'namespace b { namespace a { class bar {}; } }' > %T/include-fixer/include/bar.h
-// RUN: cd %T/include-fixer/build
-// RUN: find-all-symbols -output-dir=%T/include-fixer/symbols -p=. %T/include-fixer/src/bar.cpp
-// RUN: find-all-symbols -merge-dir=%T/include-fixer/symbols %T/include-fixer/build/find_all_symbols.yaml
-// RUN: FileCheck -input-file=%T/include-fixer/build/find_all_symbols.yaml -check-prefix=CHECK-YAML %s
-//
-// RUN: echo 'b::a::bar f;' > %T/include-fixer/src/bar.cpp
-// RUN: clang-include-fixer -db=yaml -input=%T/include-fixer/build/find_all_symbols.yaml -minimize-paths=true -p=. %T/include-fixer/src/bar.cpp
-// RUN: FileCheck -input-file=%T/include-fixer/src/bar.cpp %s
-
-// CHECK-YAML: ..{{[/\\]}}include{{[/\\]}}bar.h
-// CHECK: #include "bar.h"
-// CHECK: b::a::bar f;
diff --git a/clang-tools-extra/test/include-fixer/multiple_fixes.cpp b/clang-tools-extra/test/include-fixer/multiple_fixes.cpp
deleted file mode 100644
index 35a73b4a0af..00000000000
--- a/clang-tools-extra/test/include-fixer/multiple_fixes.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// REQUIRES: shell
-// RUN: sed -e 's#//.*$##' %s > %t.cpp
-// RUN: mkdir -p %T/include-fixer/multiple-fixes
-// RUN: echo 'foo f;' > %T/include-fixer/multiple-fixes/foo.cpp
-// RUN: echo 'bar b;' > %T/include-fixer/multiple-fixes/bar.cpp
-// RUN: clang-include-fixer -db=fixed -input='foo= "foo.h";bar= "bar.h"' %T/include-fixer/multiple-fixes/*.cpp --
-// RUN: FileCheck -input-file=%T/include-fixer/multiple-fixes/bar.cpp %s -check-prefix=CHECK-BAR
-// RUN: FileCheck -input-file=%T/include-fixer/multiple-fixes/foo.cpp %s -check-prefix=CHECK-FOO
-//
-// CHECK-FOO: #include "foo.h"
-// CHECK-FOO: foo f;
-// CHECK-BAR: #include "bar.h"
-// CHECK-BAR: bar b;