[Cmake-commits] CMake branch, next, updated. v3.1.0-2156-g5b5e673
Brad King
brad.king at kitware.com
Mon Jan 19 09:58:16 EST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 5b5e6734955f7f6c948eb7a99af3d6ce82586c83 (commit)
via 76f7eb2e4a359a7c978efa19fdf71fe1ea46b971 (commit)
from d695130d0a9f971fa3fb9ccd009b4399cb95de93 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b5e6734955f7f6c948eb7a99af3d6ce82586c83
commit 5b5e6734955f7f6c948eb7a99af3d6ce82586c83
Merge: d695130 76f7eb2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 19 09:58:15 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 19 09:58:15 2015 -0500
Merge topic 'test-ctest_submit-fail-with-RunCMake' into next
76f7eb2e Tests: Extend RunCMake.CTestSubmit test to cover 'drop' failures
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76f7eb2e4a359a7c978efa19fdf71fe1ea46b971
commit 76f7eb2e4a359a7c978efa19fdf71fe1ea46b971
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 19 09:55:59 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 19 09:56:38 2015 -0500
Tests: Extend RunCMake.CTestSubmit test to cover 'drop' failures
Replace the TODO comment with calls to run_ctest_submit_FailDrop. For
now leave curl errors out of expected stderr. They can be ported over
from CTestTestFailedSubmit-* tests later.
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt
new file mode 100644
index 0000000..b57e2de
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-cp-result.txt
@@ -0,0 +1 @@
+(-1|255)
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt
new file mode 100644
index 0000000..b451315
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/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/CTestSubmit/FailDrop-cp/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt
new file mode 100644
index 0000000..fa6e004
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt
@@ -0,0 +1 @@
+Submit files \(using cp\)
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt
new file mode 100644
index 0000000..b57e2de
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-result.txt
@@ -0,0 +1 @@
+(-1|255)
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt
new file mode 100644
index 0000000..a622fac
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt
@@ -0,0 +1,3 @@
+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-ftp-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt
new file mode 100644
index 0000000..345bb62
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt
@@ -0,0 +1,3 @@
+Submit files \(using ftp\)
+ Using FTP submit method
+ Drop site: ftp://
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt
new file mode 100644
index 0000000..b57e2de
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-http-result.txt
@@ -0,0 +1 @@
+(-1|255)
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt
new file mode 100644
index 0000000..6870d2e
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt
@@ -0,0 +1,3 @@
+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-http-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt
new file mode 100644
index 0000000..c7f35c5
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt
@@ -0,0 +1,3 @@
+Submit files \(using http\)
+ Using HTTP submit method
+ Drop site:http://
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt
new file mode 100644
index 0000000..b57e2de
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-https-result.txt
@@ -0,0 +1 @@
+(-1|255)
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt
new file mode 100644
index 0000000..a3c0cd5
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt
@@ -0,0 +1,3 @@
+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-https-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt
new file mode 100644
index 0000000..19f8234
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt
@@ -0,0 +1,3 @@
+Submit files \(using https\)
+ Using HTTP submit method
+ Drop site:https://
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt
new file mode 100644
index 0000000..b57e2de
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-scp-result.txt
@@ -0,0 +1 @@
+(-1|255)
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt
new file mode 100644
index 0000000..42b8f50
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt
@@ -0,0 +1,2 @@
+ Problems when submitting via SCP
+Error in read script: .*/Tests/RunCMake/CTestSubmit/FailDrop-scp/test.cmake
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt
new file mode 100644
index 0000000..ec2ce92
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt
@@ -0,0 +1 @@
+Submit files \(using scp\)
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt b/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt
new file mode 100644
index 0000000..b57e2de
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-result.txt
@@ -0,0 +1 @@
+(-1|255)
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt b/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt
new file mode 100644
index 0000000..020b615
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt
@@ -0,0 +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
diff --git a/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt b/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt
new file mode 100644
index 0000000..ed2acb5
--- /dev/null
+++ b/Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt
@@ -0,0 +1 @@
+Submit files \(using xmlrpc\)
diff --git a/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake b/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake
index 6f18563..7cab3f3 100644
--- a/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake
@@ -40,4 +40,9 @@ function(run_ctest_submit_FailDrop CASE_DROP_METHOD)
run_ctest(FailDrop-${CASE_DROP_METHOD})
endfunction()
-# TODO: call run_ctest_submit_FailDrop() for each submission protocol
+run_ctest_submit_FailDrop(cp)
+run_ctest_submit_FailDrop(ftp)
+run_ctest_submit_FailDrop(http)
+run_ctest_submit_FailDrop(https)
+run_ctest_submit_FailDrop(scp)
+run_ctest_submit_FailDrop(xmlrpc)
-----------------------------------------------------------------------
Summary of changes:
.../FailDrop-cp-result.txt} | 0
Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt | 4 ++++
Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt | 1 +
.../FailDrop-ftp-result.txt} | 0
Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt | 3 +++
Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt | 3 +++
.../FailDrop-http-result.txt} | 0
Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt | 3 +++
Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt | 3 +++
.../FailDrop-https-result.txt} | 0
Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt | 3 +++
Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt | 3 +++
.../FailDrop-scp-result.txt} | 0
Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt | 2 ++
Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt | 1 +
.../FailDrop-xmlrpc-result.txt} | 0
Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt | 2 ++
Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt | 1 +
Tests/RunCMake/CTestSubmit/RunCMakeTest.cmake | 7 ++++++-
19 files changed, 35 insertions(+), 1 deletion(-)
copy Tests/RunCMake/{CTestMemcheck/DummyAddressSanitizer-result.txt => CTestSubmit/FailDrop-cp-result.txt} (100%)
create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-cp-stderr.txt
create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-cp-stdout.txt
copy Tests/RunCMake/{CTestMemcheck/DummyAddressSanitizer-result.txt => CTestSubmit/FailDrop-ftp-result.txt} (100%)
create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-ftp-stderr.txt
create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-ftp-stdout.txt
copy Tests/RunCMake/{CTestMemcheck/DummyAddressSanitizer-result.txt => CTestSubmit/FailDrop-http-result.txt} (100%)
create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-http-stderr.txt
create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-http-stdout.txt
copy Tests/RunCMake/{CTestMemcheck/DummyAddressSanitizer-result.txt => CTestSubmit/FailDrop-https-result.txt} (100%)
create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-https-stderr.txt
create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-https-stdout.txt
copy Tests/RunCMake/{CTestMemcheck/DummyAddressSanitizer-result.txt => CTestSubmit/FailDrop-scp-result.txt} (100%)
create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-scp-stderr.txt
create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-scp-stdout.txt
copy Tests/RunCMake/{CTestMemcheck/DummyAddressSanitizer-result.txt => CTestSubmit/FailDrop-xmlrpc-result.txt} (100%)
create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stderr.txt
create mode 100644 Tests/RunCMake/CTestSubmit/FailDrop-xmlrpc-stdout.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list