diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-03-06 20:28:10 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-03-07 04:31:02 +0000 |
| commit | b6ecff700fe65a1962321bd2890a2b658e16d131 (patch) | |
| tree | ee66b3f1531b3a7713904acddeb6aecf39fdd1dc /cmake | |
| parent | 2d5255ec3122ac394fc4f60e734f083925b240a7 (diff) | |
Try adding "set -o igncr".
Maybe the test wrapper should be a Python script.
Change-Id: I38a5089c83ef643fb6c7c76acd599cef6aba39f4
Reviewed-on: https://code.wireshark.org/review/7572
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/GenerateTestSh.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/modules/GenerateTestSh.cmake b/cmake/modules/GenerateTestSh.cmake index 76352eb423..77cf943183 100644 --- a/cmake/modules/GenerateTestSh.cmake +++ b/cmake/modules/GenerateTestSh.cmake @@ -4,6 +4,9 @@ set(TEST_SH_EXEC ${TEST_SH_DIR}/test.sh) set(TEST_SH_OUTPUT ${TEST_SH_BIN_DIR}/test.sh) file(WRITE ${TEST_SH_OUTPUT} "#!/bin/sh\n") +if(WIN32) + file(APPEND ${TEST_SH_OUTPUT} "(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed\n") +endif() file(APPEND ${TEST_SH_OUTPUT} "# Exec wrapper for ${TEST_SH_EXEC}\n") file(APPEND ${TEST_SH_OUTPUT} "WS_BIN_PATH=${TEST_SH_BIN_DIR}\n") file(APPEND ${TEST_SH_OUTPUT} "export WS_BIN_PATH\n") |