summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-02-22 22:00:58 (GMT)
committerBrad King <brad.king@kitware.com>2017-02-22 22:00:58 (GMT)
commit25480ffbf6aacc6a61dd68934131c839eefd036e (patch)
tree6c394dfdf515c1fdeeb79eca9c1337d248e140d1 /Tests
parent970fe6ec2fa5c195f157338bb8b9b3c8766e00a3 (diff)
parentd5f39a56a44fe061018c6acc15e1c3aa7337ff54 (diff)
downloadCMake-25480ffbf6aacc6a61dd68934131c839eefd036e.zip
CMake-25480ffbf6aacc6a61dd68934131c839eefd036e.tar.gz
CMake-25480ffbf6aacc6a61dd68934131c839eefd036e.tar.bz2
Merge branch 'clang-format-attrs' into release
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CompileFeatures/.gitattributes2
-rw-r--r--Tests/PositionIndependentTargets/.gitattributes2
-rw-r--r--Tests/RunCMake/CommandLine/cmake_depends/.gitattributes2
-rw-r--r--Tests/RunCMake/GenerateExportHeader/reference/.gitattributes2
4 files changed, 8 insertions, 0 deletions
diff --git a/Tests/CompileFeatures/.gitattributes b/Tests/CompileFeatures/.gitattributes
new file mode 100644
index 0000000..83da28d
--- /dev/null
+++ b/Tests/CompileFeatures/.gitattributes
@@ -0,0 +1,2 @@
+# Do not format a source containing C++11 '>>' syntax as C++98.
+cxx_right_angle_brackets.cpp -format.clang-format
diff --git a/Tests/PositionIndependentTargets/.gitattributes b/Tests/PositionIndependentTargets/.gitattributes
new file mode 100644
index 0000000..ed36631
--- /dev/null
+++ b/Tests/PositionIndependentTargets/.gitattributes
@@ -0,0 +1,2 @@
+# Do not format a source where we want a long line preserved.
+pic_test.h -format.clang-format
diff --git a/Tests/RunCMake/CommandLine/cmake_depends/.gitattributes b/Tests/RunCMake/CommandLine/cmake_depends/.gitattributes
new file mode 100644
index 0000000..9c22288
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/cmake_depends/.gitattributes
@@ -0,0 +1,2 @@
+# Do not format a source encoded in UTF-16.
+test_UTF-16LE.h -format.clang-format
diff --git a/Tests/RunCMake/GenerateExportHeader/reference/.gitattributes b/Tests/RunCMake/GenerateExportHeader/reference/.gitattributes
new file mode 100644
index 0000000..883a7f1
--- /dev/null
+++ b/Tests/RunCMake/GenerateExportHeader/reference/.gitattributes
@@ -0,0 +1,2 @@
+# Exclude reference content from formatting.
+* -format.clang-format