diff options
| -rwxr-xr-x | test/test.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/test/test.sh b/test/test.sh index c7a2ac1d5c..7d346a0a5e 100755 --- a/test/test.sh +++ b/test/test.sh @@ -1,7 +1,7 @@ #!/bin/bash -(shopt -s igncr) 2>/dev/null && shopt -s igncr; # comment is needed -# # hack for cygwin bash -# # no-op for other +(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed +# # hack for cygwin bash +# # no-op for other # # Test various command line testable aspects of the Wireshark tools # @@ -29,6 +29,11 @@ USE_COLOR=1 RUN_SUITE="" PRINT_USAGE=0 +# Ensure cygwin bin dir is on the path if running under it +if [[ $OSTYPE == "cygwin" ]]; then + PATH="/usr/bin:$PATH" +fi + while getopts "chs:" OPTION ; do case $OPTION in c) USE_COLOR=0 ;; |