diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-15 12:10:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-15 12:10:51 (GMT) |
| commit | 9493532f80f27313e82b64b053fcc7d61626c1b4 (patch) | |
| tree | 24787f63bb2ae9ca5ad91870a4c33845fa41d6c9 /Tests/RunCMake/CommandLine | |
| parent | 64449c9f949948aa956ea03682530df9317f37ef (diff) | |
| parent | f7a5f283188c1e51b0fb549f0a78afaf1d570383 (diff) | |
| download | CMake-9493532f80f27313e82b64b053fcc7d61626c1b4.zip CMake-9493532f80f27313e82b64b053fcc7d61626c1b4.tar.gz CMake-9493532f80f27313e82b64b053fcc7d61626c1b4.tar.bz2 | |
Merge topic 'cmake-E-cat-binary'
f7a5f28318 cmake: Fix '-E cat' command for binary files on Windows
90b39a5209 cmConsoleBuf: Factor out cout/cerr console buffer management
f1fdd15863 clang-format: Fix include block order in ctest.cxx and cpack.cxx
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5364
Diffstat (limited to 'Tests/RunCMake/CommandLine')
| -rw-r--r-- | Tests/RunCMake/CommandLine/.gitattributes | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CommandLine/E_cat_binary_files/binary.obj | bin | 0 -> 124 bytes | |||
| -rw-r--r-- | Tests/RunCMake/CommandLine/E_cat_good_binary_cat-stdout.txt | bin | 0 -> 248 bytes | |||
| -rw-r--r-- | Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 3 |
4 files changed, 5 insertions, 0 deletions
diff --git a/Tests/RunCMake/CommandLine/.gitattributes b/Tests/RunCMake/CommandLine/.gitattributes new file mode 100644 index 0000000..b0b0588 --- /dev/null +++ b/Tests/RunCMake/CommandLine/.gitattributes @@ -0,0 +1,2 @@ +E_cat_binary_files/binary.obj -text +E_cat_good_binary_cat-stdout.txt -text -whitespace diff --git a/Tests/RunCMake/CommandLine/E_cat_binary_files/binary.obj b/Tests/RunCMake/CommandLine/E_cat_binary_files/binary.obj Binary files differnew file mode 100644 index 0000000..73f1749 --- /dev/null +++ b/Tests/RunCMake/CommandLine/E_cat_binary_files/binary.obj diff --git a/Tests/RunCMake/CommandLine/E_cat_good_binary_cat-stdout.txt b/Tests/RunCMake/CommandLine/E_cat_good_binary_cat-stdout.txt Binary files differnew file mode 100644 index 0000000..0951d85 --- /dev/null +++ b/Tests/RunCMake/CommandLine/E_cat_good_binary_cat-stdout.txt diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index 2a5d5d3..b23c8c2 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake @@ -563,6 +563,9 @@ run_cmake_command(E_cat_good_cat ${CMAKE_COMMAND} -E cat "${out}/first_file.txt" "${out}/second_file.txt" "${out}/unicode_file.txt") unset(out) +run_cmake_command(E_cat_good_binary_cat + ${CMAKE_COMMAND} -E cat "${RunCMake_SOURCE_DIR}/E_cat_binary_files/binary.obj" "${RunCMake_SOURCE_DIR}/E_cat_binary_files/binary.obj") + run_cmake_command(E_env-no-command0 ${CMAKE_COMMAND} -E env) run_cmake_command(E_env-no-command1 ${CMAKE_COMMAND} -E env TEST_ENV=1) run_cmake_command(E_env-bad-arg1 ${CMAKE_COMMAND} -E env -bad-arg1) |