diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-20 16:54:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-01-20 16:54:28 (GMT) |
| commit | 22d240184cfe5afda325551b68610bf7160afa8b (patch) | |
| tree | 0e433e70596e78cdf50448f5cddfccc075b50c36 /Tests/RunCMake | |
| parent | 45dea920ab4e96f84f43eab906dca3c51bd12c31 (diff) | |
| parent | 05ed82b1d2175410e8cf4d7f8b4b7ba0514d2589 (diff) | |
| download | CMake-22d240184cfe5afda325551b68610bf7160afa8b.zip CMake-22d240184cfe5afda325551b68610bf7160afa8b.tar.gz CMake-22d240184cfe5afda325551b68610bf7160afa8b.tar.bz2 | |
Merge topic 'cdash_upload_retry'
05ed82b1 ctest_submit: Update documentation for CDash upload retries
0ce7643a ctest_submit: improve handling of QUIET option
5614a5cd ctest_submit: Allow RETRY_COUNT for CDASH_UPLOAD
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/ctest_submit/CDashUploadMissingFile-result.txt (renamed from Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt) | 0 | ||||
| -rw-r--r-- | Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/ctest_submit/CDashUploadRetry-result.txt (renamed from Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt) | 0 | ||||
| -rw-r--r-- | Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/ctest_submit/RunCMakeTest.cmake | 4 |
8 files changed, 8 insertions, 6 deletions
diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-result.txt index b57e2de..b57e2de 100644 --- a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-result.txt +++ b/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-result.txt diff --git a/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt new file mode 100644 index 0000000..364ecde --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CDashUploadMissingFile-stderr.txt @@ -0,0 +1 @@ +Upload file not found: 'bad-upload' diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt deleted file mode 100644 index 21621d4..0000000 --- a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -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/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt deleted file mode 100644 index f726674..0000000 --- a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_DELAY-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -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/ctest_submit/CDashUploadRETRY_COUNT-result.txt b/Tests/RunCMake/ctest_submit/CDashUploadRetry-result.txt index b57e2de..b57e2de 100644 --- a/Tests/RunCMake/ctest_submit/CDashUploadRETRY_COUNT-result.txt +++ b/Tests/RunCMake/ctest_submit/CDashUploadRetry-result.txt diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt b/Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt new file mode 100644 index 0000000..6780c17 --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CDashUploadRetry-stderr.txt @@ -0,0 +1 @@ +error uploading to CDash. diff --git a/Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt b/Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt new file mode 100644 index 0000000..a5459ac --- /dev/null +++ b/Tests/RunCMake/ctest_submit/CDashUploadRetry-stdout.txt @@ -0,0 +1,4 @@ + Upload failed, waiting 1 seconds... + Retry upload: Attempt 1 of 2 + Upload failed, waiting 1 seconds... + Retry upload: Attempt 2 of 2 diff --git a/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake index a81bc96..e104f8a 100644 --- a/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake +++ b/Tests/RunCMake/ctest_submit/RunCMakeTest.cmake @@ -21,9 +21,9 @@ run_ctest_submit(PARTSCDashUpload PARTS Configure CDASH_UPLOAD) run_ctest_submit(PARTSCDashUploadType PARTS Configure CDASH_UPLOAD_TYPE) run_ctest_submit(CDashUploadPARTS CDASH_UPLOAD bad-upload PARTS) run_ctest_submit(CDashUploadFILES CDASH_UPLOAD bad-upload FILES) -run_ctest_submit(CDashUploadRETRY_COUNT CDASH_UPLOAD bad-upload RETRY_COUNT) -run_ctest_submit(CDashUploadRETRY_DELAY CDASH_UPLOAD bad-upload RETRY_DELAY) run_ctest_submit(CDashUploadNone CDASH_UPLOAD) +run_ctest_submit(CDashUploadMissingFile CDASH_UPLOAD bad-upload) +run_ctest_submit(CDashUploadRetry CDASH_UPLOAD ${CMAKE_CURRENT_LIST_FILE} CDASH_UPLOAD_TYPE foo RETRY_COUNT 2 RETRY_DELAY 1 INTERNAL_TEST_CHECKSUM) run_ctest_submit(CDashSubmitQuiet QUIET) function(run_ctest_CDashUploadFTP) |