21 files changed, 14 insertions, 14 deletions
diff --git a/Tests/RunCMake/file-CHMOD/RunCMakeTest.cmake b/Tests/RunCMake/file-CHMOD/RunCMakeTest.cmake
index 18deb89..52b6d4e 100644
--- a/Tests/RunCMake/file-CHMOD/RunCMakeTest.cmake
+++ b/Tests/RunCMake/file-CHMOD/RunCMakeTest.cmake
@@ -1,12 +1,12 @@
 include(RunCMake)
 
-run_cmake(CHMOD-no-perms)
-run_cmake(CHMOD-no-keyword)
-run_cmake(CHMOD-all-perms)
-run_cmake(CHMOD-invalid-perms)
-run_cmake(CHMOD-invalid-path)
-run_cmake(CHMOD-ok)
-run_cmake(CHMOD-override)
+run_cmake(no-perms)
+run_cmake(no-keyword)
+run_cmake(all-perms)
+run_cmake(invalid-perms)
+run_cmake(invalid-path)
+run_cmake(ok)
+run_cmake(override)
 
 if(UNIX)
   execute_process(COMMAND id -u $ENV{USER}
@@ -15,5 +15,5 @@ if(UNIX)
 endif()
 
 if(NOT WIN32 AND NOT MSYS AND NOT "${uid}" STREQUAL "0")
-  run_cmake(CHMOD-write-only)
+  run_cmake(write-only)
 endif()
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-write-only-result.txt b/Tests/RunCMake/file-CHMOD/all-perms-result.txt
index d00491f..d00491f 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-write-only-result.txt
+++ b/Tests/RunCMake/file-CHMOD/all-perms-result.txt
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-all-perms-stderr.txt b/Tests/RunCMake/file-CHMOD/all-perms-stderr.txt
index b22387b..8853aed 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-all-perms-stderr.txt
+++ b/Tests/RunCMake/file-CHMOD/all-perms-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at CHMOD-all-perms\.cmake:[0-9]+ \(file\):
+CMake Error at all-perms\.cmake:[0-9]+ \(file\):
   file Remove either PERMISSIONS or FILE_PERMISSIONS or DIRECTORY_PERMISSIONS
   from the invocation
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-all-perms.cmake b/Tests/RunCMake/file-CHMOD/all-perms.cmake
index b49583d..b49583d 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-all-perms.cmake
+++ b/Tests/RunCMake/file-CHMOD/all-perms.cmake
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-no-perms-result.txt b/Tests/RunCMake/file-CHMOD/invalid-path-result.txt
index d00491f..d00491f 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-no-perms-result.txt
+++ b/Tests/RunCMake/file-CHMOD/invalid-path-result.txt
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-invalid-path-stderr.txt b/Tests/RunCMake/file-CHMOD/invalid-path-stderr.txt
index 8d09e35..f2f9c82 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-invalid-path-stderr.txt
+++ b/Tests/RunCMake/file-CHMOD/invalid-path-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at CHMOD-invalid-path\.cmake:[0-9]+ \(file\):
+CMake Error at invalid-path\.cmake:[0-9]+ \(file\):
   file does not exist:
 
   .*/chmod-tests/I_dont_exist
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-invalid-path.cmake b/Tests/RunCMake/file-CHMOD/invalid-path.cmake
index 36915c1..36915c1 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-invalid-path.cmake
+++ b/Tests/RunCMake/file-CHMOD/invalid-path.cmake
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-no-keyword-result.txt b/Tests/RunCMake/file-CHMOD/invalid-perms-result.txt
index d00491f..d00491f 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-no-keyword-result.txt
+++ b/Tests/RunCMake/file-CHMOD/invalid-perms-result.txt
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-invalid-perms-stderr.txt b/Tests/RunCMake/file-CHMOD/invalid-perms-stderr.txt
index 84ba2a2..003252a 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-invalid-perms-stderr.txt
+++ b/Tests/RunCMake/file-CHMOD/invalid-perms-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at CHMOD-invalid-perms\.cmake:[0-9]+ \(file\):
+CMake Error at invalid-perms\.cmake:[0-9]+ \(file\):
   file INVALID_PERMISSION is an invalid permission specifier
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-invalid-perms.cmake b/Tests/RunCMake/file-CHMOD/invalid-perms.cmake
index 22cab0b..22cab0b 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-invalid-perms.cmake
+++ b/Tests/RunCMake/file-CHMOD/invalid-perms.cmake
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-invalid-perms-result.txt b/Tests/RunCMake/file-CHMOD/no-keyword-result.txt
index d00491f..d00491f 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-invalid-perms-result.txt
+++ b/Tests/RunCMake/file-CHMOD/no-keyword-result.txt
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-no-perms-stderr.txt b/Tests/RunCMake/file-CHMOD/no-keyword-stderr.txt
index a18609f..1dfc6a9 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-no-perms-stderr.txt
+++ b/Tests/RunCMake/file-CHMOD/no-keyword-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at CHMOD-no-perms\.cmake:[0-9]+ \(file\):
+CMake Error at no-keyword\.cmake:[0-9]+ \(file\):
   file No permissions given
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-no-keyword.cmake b/Tests/RunCMake/file-CHMOD/no-keyword.cmake
index 8b62106..8b62106 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-no-keyword.cmake
+++ b/Tests/RunCMake/file-CHMOD/no-keyword.cmake
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-invalid-path-result.txt b/Tests/RunCMake/file-CHMOD/no-perms-result.txt
index d00491f..d00491f 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-invalid-path-result.txt
+++ b/Tests/RunCMake/file-CHMOD/no-perms-result.txt
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-no-keyword-stderr.txt b/Tests/RunCMake/file-CHMOD/no-perms-stderr.txt
index 2c248f8..1d18464 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-no-keyword-stderr.txt
+++ b/Tests/RunCMake/file-CHMOD/no-perms-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at CHMOD-no-keyword\.cmake:[0-9]+ \(file\):
+CMake Error at no-perms\.cmake:[0-9]+ \(file\):
   file No permissions given
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-no-perms.cmake b/Tests/RunCMake/file-CHMOD/no-perms.cmake
index 9fbd359..9fbd359 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-no-perms.cmake
+++ b/Tests/RunCMake/file-CHMOD/no-perms.cmake
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-ok.cmake b/Tests/RunCMake/file-CHMOD/ok.cmake
index 87e3e57..87e3e57 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-ok.cmake
+++ b/Tests/RunCMake/file-CHMOD/ok.cmake
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-override.cmake b/Tests/RunCMake/file-CHMOD/override.cmake
index d9226b8..d9226b8 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-override.cmake
+++ b/Tests/RunCMake/file-CHMOD/override.cmake
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-all-perms-result.txt b/Tests/RunCMake/file-CHMOD/write-only-result.txt
index d00491f..d00491f 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-all-perms-result.txt
+++ b/Tests/RunCMake/file-CHMOD/write-only-result.txt
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-write-only-stderr.txt b/Tests/RunCMake/file-CHMOD/write-only-stderr.txt
index 1c87a59..da310a2 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-write-only-stderr.txt
+++ b/Tests/RunCMake/file-CHMOD/write-only-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at CHMOD-write-only\.cmake:[0-9]+ \(file\):
+CMake Error at write-only\.cmake:[0-9]+ \(file\):
   file failed to open for reading \(Permission denied\):
 
     .*/chmod-tests/a
diff --git a/Tests/RunCMake/file-CHMOD/CHMOD-write-only.cmake b/Tests/RunCMake/file-CHMOD/write-only.cmake
index 1289efc..1289efc 100644
--- a/Tests/RunCMake/file-CHMOD/CHMOD-write-only.cmake
+++ b/Tests/RunCMake/file-CHMOD/write-only.cmake