diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-10 12:33:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-10 12:33:00 (GMT) |
| commit | 10859b97ebbe610a829e3981958d7b4c0149f95a (patch) | |
| tree | 992b9334ad833f69543702c50d1166ff1b2c06e4 /Tests/RunCMake/CommandLine | |
| parent | 1264c5b2c485416128466510c42ab40a03eb0ca3 (diff) | |
| parent | 6c4781baa9ea4cfb7b4de9ef91e58888286fab44 (diff) | |
| download | CMake-10859b97ebbe610a829e3981958d7b4c0149f95a.zip CMake-10859b97ebbe610a829e3981958d7b4c0149f95a.tar.gz CMake-10859b97ebbe610a829e3981958d7b4c0149f95a.tar.bz2 | |
Merge topic 'tar-write-format'
6c4781ba Tests: Consolidate, refactor and extend -E tar tests
fd04d873 CTestCoverageCollectGCOV: Write tar files intended for CDash in gnutar format
d2cc5807 cmake: Teach "-E tar" command a "--format=" option
Diffstat (limited to 'Tests/RunCMake/CommandLine')
20 files changed, 0 insertions, 37 deletions
diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-from1-result.txt b/Tests/RunCMake/CommandLine/E_tar-bad-from1-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-from1-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-from1-stderr.txt b/Tests/RunCMake/CommandLine/E_tar-bad-from1-stderr.txt deleted file mode 100644 index d67431d..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-from1-stderr.txt +++ /dev/null @@ -1 +0,0 @@ -^CMake Error: -E tar --files-from= file 'bad' not found$ diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-from2-result.txt b/Tests/RunCMake/CommandLine/E_tar-bad-from2-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-from2-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-from2-stderr.txt b/Tests/RunCMake/CommandLine/E_tar-bad-from2-stderr.txt deleted file mode 100644 index d1d278c..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-from2-stderr.txt +++ /dev/null @@ -1 +0,0 @@ -^CMake Error: -E tar --files-from= file '\.' is a directory$ diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-from3-result.txt b/Tests/RunCMake/CommandLine/E_tar-bad-from3-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-from3-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-from3-stderr.txt b/Tests/RunCMake/CommandLine/E_tar-bad-from3-stderr.txt deleted file mode 100644 index 147bd80..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-from3-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -^CMake Error: -E tar --files-from='.*/Tests/RunCMake/CommandLine/E_tar-bad-from3.txt' file invalid line: --add-file=option-typo$ diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-from3.txt b/Tests/RunCMake/CommandLine/E_tar-bad-from3.txt deleted file mode 100644 index 5bad1c3..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-from3.txt +++ /dev/null @@ -1 +0,0 @@ --add-file=option-typo diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-from4-result.txt b/Tests/RunCMake/CommandLine/E_tar-bad-from4-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-from4-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-from4-stderr.txt b/Tests/RunCMake/CommandLine/E_tar-bad-from4-stderr.txt deleted file mode 100644 index 1417d4d..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-from4-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -^CMake Error: archive_read_disk_entry_from_file 'does-not-exist':.* -CMake Error: Problem creating tar: bad.tar$ diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-from4.txt b/Tests/RunCMake/CommandLine/E_tar-bad-from4.txt deleted file mode 100644 index 4b97f79..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-from4.txt +++ /dev/null @@ -1,2 +0,0 @@ - -does-not-exist diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-from5-result.txt b/Tests/RunCMake/CommandLine/E_tar-bad-from5-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-from5-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-from5-stderr.txt b/Tests/RunCMake/CommandLine/E_tar-bad-from5-stderr.txt deleted file mode 100644 index 1417d4d..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-from5-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -^CMake Error: archive_read_disk_entry_from_file 'does-not-exist':.* -CMake Error: Problem creating tar: bad.tar$ diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-from5.txt b/Tests/RunCMake/CommandLine/E_tar-bad-from5.txt deleted file mode 100644 index 9ea755b..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-from5.txt +++ /dev/null @@ -1,2 +0,0 @@ - ---add-file=does-not-exist diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-mtime1-result.txt b/Tests/RunCMake/CommandLine/E_tar-bad-mtime1-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-mtime1-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-mtime1-stderr.txt b/Tests/RunCMake/CommandLine/E_tar-bad-mtime1-stderr.txt deleted file mode 100644 index ca925f1..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-mtime1-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -^CMake Error: unable to parse mtime 'bad' -CMake Error: Problem creating tar: bad.tar$ diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-opt1-result.txt b/Tests/RunCMake/CommandLine/E_tar-bad-opt1-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-opt1-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/CommandLine/E_tar-bad-opt1-stderr.txt b/Tests/RunCMake/CommandLine/E_tar-bad-opt1-stderr.txt deleted file mode 100644 index 35133c8..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-bad-opt1-stderr.txt +++ /dev/null @@ -1 +0,0 @@ -^CMake Error: Unknown option to -E tar: --bad$ diff --git a/Tests/RunCMake/CommandLine/E_tar-end-opt1-result.txt b/Tests/RunCMake/CommandLine/E_tar-end-opt1-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-end-opt1-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/CommandLine/E_tar-end-opt1-stderr.txt b/Tests/RunCMake/CommandLine/E_tar-end-opt1-stderr.txt deleted file mode 100644 index 1fddf6d..0000000 --- a/Tests/RunCMake/CommandLine/E_tar-end-opt1-stderr.txt +++ /dev/null @@ -1,2 +0,0 @@ -^CMake Error: archive_read_disk_entry_from_file '--bad':.* -CMake Error: Problem creating tar: bad.tar$ diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index e8b4584..f879ee6 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake @@ -1,16 +1,5 @@ include(RunCMake) -run_cmake_command(E_tar-bad-opt1 ${CMAKE_COMMAND} -E tar cvf bad.tar --bad) -run_cmake_command(E_tar-bad-mtime1 ${CMAKE_COMMAND} -E tar cvf bad.tar --mtime=bad .) -run_cmake_command(E_tar-bad-from1 ${CMAKE_COMMAND} -E tar cvf bad.tar --files-from=bad) -run_cmake_command(E_tar-bad-from2 ${CMAKE_COMMAND} -E tar cvf bad.tar --files-from=.) -run_cmake_command(E_tar-bad-from3 ${CMAKE_COMMAND} -E tar cvf bad.tar --files-from=${CMAKE_CURRENT_LIST_DIR}/E_tar-bad-from3.txt) -run_cmake_command(E_tar-bad-from4 ${CMAKE_COMMAND} -E tar cvf bad.tar --files-from=${CMAKE_CURRENT_LIST_DIR}/E_tar-bad-from4.txt) -run_cmake_command(E_tar-bad-from5 ${CMAKE_COMMAND} -E tar cvf bad.tar --files-from=${CMAKE_CURRENT_LIST_DIR}/E_tar-bad-from5.txt) -run_cmake_command(E_tar-end-opt1 ${CMAKE_COMMAND} -E tar cvf bad.tar -- --bad) -run_cmake_command(E_tar-end-opt2 ${CMAKE_COMMAND} -E tar cvf bad.tar --) -run_cmake_command(E_tar-mtime ${CMAKE_COMMAND} -E tar cvf bad.tar "--mtime=1970-01-01 00:00:00 UTC") - run_cmake_command(build-no-cache ${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}) run_cmake_command(build-no-generator |