Rename test->testfiles folder to avoid naming conflict

(bzr r14967.1.1)

8 files changed, 2 insertions, 2 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91a090371..5f3d1aac0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,11 +211,11 @@ add_custom_target(clean-all
 
 #-----------------------------------------------------------------------------
 
-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
+#add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
 
 if(WITH_GTEST)
     enable_testing()
-    add_subdirectory(test EXCLUDE_FROM_ALL)
+    add_subdirectory(testfiles EXCLUDE_FROM_ALL)
 endif()
 
 # Canonicalize the flags to speed up recompilation using ccache/etc.
diff --git a/test/CMakeLists.txt b/testfiles/CMakeLists.txt
index 8da39d627..8da39d627 100644
--- a/test/CMakeLists.txt
+++ b/testfiles/CMakeLists.txt
diff --git a/test/doc-per-case-test.cpp b/testfiles/doc-per-case-test.cpp
index da75b1e65..da75b1e65 100644
--- a/test/doc-per-case-test.cpp
+++ b/testfiles/doc-per-case-test.cpp
diff --git a/test/doc-per-case-test.h b/testfiles/doc-per-case-test.h
index b6f01403a..b6f01403a 100644
--- a/test/doc-per-case-test.h
+++ b/testfiles/doc-per-case-test.h
diff --git a/test/src/attributes-test.cpp b/testfiles/src/attributes-test.cpp
index 41c0274ec..41c0274ec 100644
--- a/test/src/attributes-test.cpp
+++ b/testfiles/src/attributes-test.cpp
diff --git a/test/src/color-profile-test.cpp b/testfiles/src/color-profile-test.cpp
index 365be687a..365be687a 100644
--- a/test/src/color-profile-test.cpp
+++ b/testfiles/src/color-profile-test.cpp
diff --git a/test/src/dir-util-test.cpp b/testfiles/src/dir-util-test.cpp
index 32b3fce74..32b3fce74 100644
--- a/test/src/dir-util-test.cpp
+++ b/testfiles/src/dir-util-test.cpp
diff --git a/test/unittest.cpp b/testfiles/unittest.cpp
index 0ec8f0383..0ec8f0383 100644
--- a/test/unittest.cpp
+++ b/testfiles/unittest.cpp