From d7662141a771f105e64b56543d99ee43e7d00849 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 19 Feb 2015 11:33:32 -0500
Subject: [PATCH] Tests: Rename RunCMake.{CTestSubmit => ctest_submit}

Follow the convention of naming tests after the command they test.
---
 Tests/RunCMake/CMakeLists.txt                                 | 2 +-
 Tests/RunCMake/CTestSubmit/BadArg-stderr.txt                  | 2 --
 Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt                | 2 --
 Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt                | 2 --
 Tests/RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt        | 2 --
 Tests/RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt        | 2 --
 Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt  | 2 --
 Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt  | 2 --
 Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt             | 4 ----
 Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt            | 3 ---
 Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt           | 3 ---
 Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt          | 3 ---
 Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt            | 2 --
 Tests/RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt        | 2 --
 Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-stderr.txt    | 2 --
 Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-stderr.txt      | 2 --
 .../RunCMake/{CTestSubmit => ctest_submit}/BadArg-result.txt  | 0
 Tests/RunCMake/ctest_submit/BadArg-stderr.txt                 | 2 ++
 .../{CTestSubmit => ctest_submit}/BadFILES-result.txt         | 0
 Tests/RunCMake/ctest_submit/BadFILES-stderr.txt               | 2 ++
 .../{CTestSubmit => ctest_submit}/BadPARTS-result.txt         | 0
 Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt               | 2 ++
 .../{CTestSubmit => ctest_submit}/CDashUploadFILES-result.txt | 0
 Tests/RunCMake/ctest_submit/CDashUploadFILES-stderr.txt       | 2 ++
 .../{CTestSubmit => ctest_submit}/CDashUploadFTP-result.txt   | 0
 .../{CTestSubmit => ctest_submit}/CDashUploadFTP-stderr.txt   | 0
 .../{CTestSubmit => ctest_submit}/CDashUploadNone-result.txt  | 0
 .../{CTestSubmit => ctest_submit}/CDashUploadNone-stderr.txt  | 0
 .../{CTestSubmit => ctest_submit}/CDashUploadPARTS-result.txt | 0
 Tests/RunCMake/ctest_submit/CDashUploadPARTS-stderr.txt       | 2 ++
 .../CDashUploadRETRY_COUNT-result.txt                         | 0
 Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt | 2 ++
 .../CDashUploadRETRY_DELAY-result.txt                         | 0
 Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt | 2 ++
 .../RunCMake/{CTestSubmit => ctest_submit}/CMakeLists.txt.in  | 0
 .../{CTestSubmit => ctest_submit}/CTestConfig.cmake.in        | 0
 .../{CTestSubmit => ctest_submit}/FailDrop-cp-result.txt      | 0
 Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt            | 4 ++++
 .../{CTestSubmit => ctest_submit}/FailDrop-cp-stdout.txt      | 0
 .../{CTestSubmit => ctest_submit}/FailDrop-ftp-result.txt     | 0
 Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt           | 3 +++
 .../{CTestSubmit => ctest_submit}/FailDrop-ftp-stdout.txt     | 0
 .../{CTestSubmit => ctest_submit}/FailDrop-http-result.txt    | 0
 Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt          | 3 +++
 .../{CTestSubmit => ctest_submit}/FailDrop-http-stdout.txt    | 0
 .../{CTestSubmit => ctest_submit}/FailDrop-https-result.txt   | 0
 Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt         | 3 +++
 .../{CTestSubmit => ctest_submit}/FailDrop-https-stdout.txt   | 0
 .../{CTestSubmit => ctest_submit}/FailDrop-scp-result.txt     | 0
 Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt           | 2 ++
 .../{CTestSubmit => ctest_submit}/FailDrop-scp-stdout.txt     | 0
 .../{CTestSubmit => ctest_submit}/FailDrop-xmlrpc-result.txt  | 0
 .../{CTestSubmit => ctest_submit}/FailDrop-xmlrpc-stderr.txt  | 2 +-
 .../{CTestSubmit => ctest_submit}/FailDrop-xmlrpc-stdout.txt  | 0
 .../{CTestSubmit => ctest_submit}/PARTSCDashUpload-result.txt | 0
 Tests/RunCMake/ctest_submit/PARTSCDashUpload-stderr.txt       | 2 ++
 .../PARTSCDashUploadType-result.txt                           | 0
 Tests/RunCMake/ctest_submit/PARTSCDashUploadType-stderr.txt   | 2 ++
 .../RepeatRETURN_VALUE-result.txt                             | 0
 Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-stderr.txt     | 2 ++
 .../RunCMake/{CTestSubmit => ctest_submit}/RunCMakeTest.cmake | 0
 Tests/RunCMake/{CTestSubmit => ctest_submit}/test.cmake.in    | 0
 62 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 Tests/RunCMake/CTestSubmit/BadArg-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-stderr.txt
 delete mode 100644 Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/BadArg-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/BadArg-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/BadFILES-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/BadFILES-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/BadPARTS-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadFILES-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadFILES-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadFTP-result.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadFTP-stderr.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadNone-result.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadNone-stderr.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadPARTS-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadPARTS-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadRETRY_COUNT-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CDashUploadRETRY_DELAY-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CMakeLists.txt.in (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/CTestConfig.cmake.in (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-cp-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-cp-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-ftp-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-ftp-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-http-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-http-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-https-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-https-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-scp-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-scp-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-xmlrpc-result.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-xmlrpc-stderr.txt (54%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/FailDrop-xmlrpc-stdout.txt (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/PARTSCDashUpload-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/PARTSCDashUpload-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/PARTSCDashUploadType-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/PARTSCDashUploadType-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/RepeatRETURN_VALUE-result.txt (100%)
 create mode 100644 Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-stderr.txt
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/RunCMakeTest.cmake (100%)
 rename Tests/RunCMake/{CTestSubmit => ctest_submit}/test.cmake.in (100%)

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 2de82a7ce9..44e6ec4627 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -64,7 +64,6 @@ add_RunCMake_test(CMP0053)
 add_RunCMake_test(CMP0054)
 add_RunCMake_test(CMP0055)
 add_RunCMake_test(CTest)
-add_RunCMake_test(CTestSubmit)
 
 if(NOT CMake_TEST_EXTERNAL_CMAKE)
   add_RunCMake_test(CTestMemcheck
@@ -130,6 +129,7 @@ add_RunCMake_test(build_command)
 add_RunCMake_test(export)
 add_RunCMake_test(cmake_minimum_required)
 add_RunCMake_test(continue)
+add_RunCMake_test(ctest_submit)
 add_RunCMake_test(file)
 add_RunCMake_test(find_library)
 add_RunCMake_test(find_package)
diff --git a/Tests/RunCMake/CTestSubmit/BadArg-stderr.txt b/Tests/RunCMake/CTestSubmit/BadArg-stderr.txt
deleted file mode 100644
index 68812ab7f5..0000000000
--- a/Tests/RunCMake/CTestSubmit/BadArg-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/BadArg/test.cmake:[0-9]+ \(ctest_submit\):
-  ctest_submit called with unknown argument "bad-arg".
diff --git a/Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt b/Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt
deleted file mode 100644
index 703224b249..0000000000
--- a/Tests/RunCMake/CTestSubmit/BadFILES-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/BadFILES/test.cmake:[0-9]+ \(ctest_submit\):
-  File "bad-file" does not exist.  Cannot submit a non-existent file.
diff --git a/Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt b/Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt
deleted file mode 100644
index 4e491a9c04..0000000000
--- a/Tests/RunCMake/CTestSubmit/BadPARTS-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/BadPARTS/test.cmake:[0-9]+ \(ctest_submit\):
-  Part name "bad-part" is invalid.
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt b/Tests/RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt
deleted file mode 100644
index 48177e2c08..0000000000
--- a/Tests/RunCMake/CTestSubmit/CDashUploadFILES-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/CDashUploadFILES/test.cmake:[0-9]+ \(ctest_submit\):
-  ctest_submit called with unknown argument "FILES".
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt b/Tests/RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt
deleted file mode 100644
index 497ead2981..0000000000
--- a/Tests/RunCMake/CTestSubmit/CDashUploadPARTS-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/CDashUploadPARTS/test.cmake:[0-9]+ \(ctest_submit\):
-  ctest_submit called with unknown argument "PARTS".
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt b/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt
deleted file mode 100644
index 8c4e6b1363..0000000000
--- a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT/test.cmake:[0-9]+ \(ctest_submit\):
-  ctest_submit called with unknown argument "RETRY_COUNT".
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt b/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt
deleted file mode 100644
index 6c56399d96..0000000000
--- a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY/test.cmake:[0-9]+ \(ctest_submit\):
-  ctest_submit called with unknown argument "RETRY_DELAY".
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt
deleted file mode 100644
index b451315d0b..0000000000
--- a/Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Missing arguments for submit via cp:
-.*
-   Problems when submitting via CP
-Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-cp/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt
deleted file mode 100644
index a622fac085..0000000000
--- a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Error message was: .*
-   Problems when submitting via FTP
-Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-ftp/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt
deleted file mode 100644
index 6870d2ebe9..0000000000
--- a/Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Error message was: .*
-   Problems when submitting via HTTP
-Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-http/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt
deleted file mode 100644
index a3c0cd5811..0000000000
--- a/Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Error message was: .*
-   Problems when submitting via HTTP
-Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-https/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt
deleted file mode 100644
index 42b8f5070c..0000000000
--- a/Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-   Problems when submitting via SCP
-Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-scp/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt b/Tests/RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt
deleted file mode 100644
index dfa7e33fac..0000000000
--- a/Tests/RunCMake/CTestSubmit/PARTSCDashUpload-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/PARTSCDashUpload/test.cmake:[0-9]+ \(ctest_submit\):
-  Part name "CDASH_UPLOAD" is invalid.
diff --git a/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-stderr.txt b/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-stderr.txt
deleted file mode 100644
index 42becafd98..0000000000
--- a/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType/test.cmake:[0-9]+ \(ctest_submit\):
-  Part name "CDASH_UPLOAD_TYPE" is invalid.
diff --git a/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-stderr.txt b/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-stderr.txt
deleted file mode 100644
index d56793e0e5..0000000000
--- a/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-stderr.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CMake Error at .*/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE/test.cmake:[0-9]+ \(ctest_submit\):
-  Called with more than one value for RETURN_VALUE
diff --git a/Tests/RunCMake/CTestSubmit/BadArg-result.txt b/Tests/RunCMake/ctest_submit/BadArg-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/BadArg-result.txt
rename to Tests/RunCMake/ctest_submit/BadArg-result.txt
diff --git a/Tests/RunCMake/ctest_submit/BadArg-stderr.txt b/Tests/RunCMake/ctest_submit/BadArg-stderr.txt
new file mode 100644
index 0000000000..7eeef0a2de
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/BadArg-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/BadArg/test.cmake:[0-9]+ \(ctest_submit\):
+  ctest_submit called with unknown argument "bad-arg".
diff --git a/Tests/RunCMake/CTestSubmit/BadFILES-result.txt b/Tests/RunCMake/ctest_submit/BadFILES-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/BadFILES-result.txt
rename to Tests/RunCMake/ctest_submit/BadFILES-result.txt
diff --git a/Tests/RunCMake/ctest_submit/BadFILES-stderr.txt b/Tests/RunCMake/ctest_submit/BadFILES-stderr.txt
new file mode 100644
index 0000000000..ab84ab9325
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/BadFILES-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/BadFILES/test.cmake:[0-9]+ \(ctest_submit\):
+  File "bad-file" does not exist.  Cannot submit a non-existent file.
diff --git a/Tests/RunCMake/CTestSubmit/BadPARTS-result.txt b/Tests/RunCMake/ctest_submit/BadPARTS-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/BadPARTS-result.txt
rename to Tests/RunCMake/ctest_submit/BadPARTS-result.txt
diff --git a/Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt b/Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt
new file mode 100644
index 0000000000..3db54f3ed4
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/BadPARTS-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/BadPARTS/test.cmake:[0-9]+ \(ctest_submit\):
+  Part name "bad-part" is invalid.
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadFILES-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadFILES-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CDashUploadFILES-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadFILES-result.txt
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadFILES-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadFILES-stderr.txt
new file mode 100644
index 0000000000..0106fee301
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashUploadFILES-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadFILES/test.cmake:[0-9]+ \(ctest_submit\):
+  ctest_submit called with unknown argument "FILES".
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadFTP-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadFTP-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CDashUploadFTP-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadFTP-result.txt
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadFTP-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadFTP-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CDashUploadFTP-stderr.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadFTP-stderr.txt
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadNone-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadNone-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CDashUploadNone-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadNone-result.txt
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadNone-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadNone-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CDashUploadNone-stderr.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadNone-stderr.txt
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadPARTS-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadPARTS-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CDashUploadPARTS-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadPARTS-result.txt
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadPARTS-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadPARTS-stderr.txt
new file mode 100644
index 0000000000..fe94cb7179
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashUploadPARTS-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadPARTS/test.cmake:[0-9]+ \(ctest_submit\):
+  ctest_submit called with unknown argument "PARTS".
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CDashUploadRETRY_COUNT-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
new file mode 100644
index 0000000000..21621d440e
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT/test.cmake:[0-9]+ \(ctest_submit\):
+  ctest_submit called with unknown argument "RETRY_COUNT".
diff --git a/Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CDashUploadRETRY_DELAY-result.txt
rename to Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
new file mode 100644
index 0000000000..f726674d9b
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY/test.cmake:[0-9]+ \(ctest_submit\):
+  ctest_submit called with unknown argument "RETRY_DELAY".
diff --git a/Tests/RunCMake/CTestSubmit/CMakeLists.txt.in b/Tests/RunCMake/ctest_submit/CMakeLists.txt.in
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CMakeLists.txt.in
rename to Tests/RunCMake/ctest_submit/CMakeLists.txt.in
diff --git a/Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in b/Tests/RunCMake/ctest_submit/CTestConfig.cmake.in
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/CTestConfig.cmake.in
rename to Tests/RunCMake/ctest_submit/CTestConfig.cmake.in
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-cp-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-cp-result.txt
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
new file mode 100644
index 0000000000..c3c084d5aa
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
@@ -0,0 +1,4 @@
+Missing arguments for submit via cp:
+.*
+   Problems when submitting via CP
+Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-cp/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-cp-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-cp-stdout.txt
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-ftp-result.txt
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
new file mode 100644
index 0000000000..73df5c1b26
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
@@ -0,0 +1,3 @@
+Error message was: .*
+   Problems when submitting via FTP
+Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-ftp/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-ftp-stdout.txt
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-http-result.txt
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
new file mode 100644
index 0000000000..c1a91265c4
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
@@ -0,0 +1,3 @@
+Error message was: .*
+   Problems when submitting via HTTP
+Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-http/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-http-stdout.txt
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-https-result.txt
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
new file mode 100644
index 0000000000..11db01a934
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
@@ -0,0 +1,3 @@
+Error message was: .*
+   Problems when submitting via HTTP
+Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-https/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-https-stdout.txt
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-scp-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-scp-result.txt
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
new file mode 100644
index 0000000000..07902977b2
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
@@ -0,0 +1,2 @@
+   Problems when submitting via SCP
+Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-scp/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-scp-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-scp-stdout.txt
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-result.txt
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt
similarity index 54%
rename from Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt
index 020b615ac0..23ea92cc55 100644
--- a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt
@@ -1,2 +1,2 @@
    (Problems when submitting via XML-RPC|Submission method "xmlrpc" not compiled into CTest!)
-Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc/test.cmake
+Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt
rename to Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stdout.txt
diff --git a/Tests/RunCMake/CTestSubmit/PARTSCDashUpload-result.txt b/Tests/RunCMake/ctest_submit/PARTSCDashUpload-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/PARTSCDashUpload-result.txt
rename to Tests/RunCMake/ctest_submit/PARTSCDashUpload-result.txt
diff --git a/Tests/RunCMake/ctest_submit/PARTSCDashUpload-stderr.txt b/Tests/RunCMake/ctest_submit/PARTSCDashUpload-stderr.txt
new file mode 100644
index 0000000000..ad4c8cbf01
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/PARTSCDashUpload-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/PARTSCDashUpload/test.cmake:[0-9]+ \(ctest_submit\):
+  Part name "CDASH_UPLOAD" is invalid.
diff --git a/Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-result.txt b/Tests/RunCMake/ctest_submit/PARTSCDashUploadType-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/PARTSCDashUploadType-result.txt
rename to Tests/RunCMake/ctest_submit/PARTSCDashUploadType-result.txt
diff --git a/Tests/RunCMake/ctest_submit/PARTSCDashUploadType-stderr.txt b/Tests/RunCMake/ctest_submit/PARTSCDashUploadType-stderr.txt
new file mode 100644
index 0000000000..8d8a8520f2
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/PARTSCDashUploadType-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/PARTSCDashUploadType/test.cmake:[0-9]+ \(ctest_submit\):
+  Part name "CDASH_UPLOAD_TYPE" is invalid.
diff --git a/Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-result.txt b/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/RepeatRETURN_VALUE-result.txt
rename to Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-result.txt
diff --git a/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-stderr.txt b/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-stderr.txt
new file mode 100644
index 0000000000..6e17c759ee
--- /dev/null
+++ b/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE-stderr.txt
@@ -0,0 +1,2 @@
+CMake Error at .*/Tests/RunCMake/ctest_submit/RepeatRETURN_VALUE/test.cmake:[0-9]+ \(ctest_submit\):
+  Called with more than one value for RETURN_VALUE
diff --git a/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake
rename to Tests/RunCMake/ctest_submit/RunCMakeTest.cmake
diff --git a/Tests/RunCMake/CTestSubmit/test.cmake.in b/Tests/RunCMake/ctest_submit/test.cmake.in
similarity index 100%
rename from Tests/RunCMake/CTestSubmit/test.cmake.in
rename to Tests/RunCMake/ctest_submit/test.cmake.in