aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2007-08-27 17:49:53 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2007-08-27 17:49:53 +0000
commit49d07196ad40f1f9af877337d5ca2be9313f40e1 (patch)
tree3dcf0b32e780c55b92731c5ee16ea412d67b4ac9 /test
parent301dd89b9d90e73abf705f472b6c75f7141fb7dc (diff)
Prevent execution of the fifo tests on Windows.
(Windows cygwin has a mkfifo but Windows dumpcap & etc use Windows named pipes which are different than the cygwin named pipes). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22685 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'test')
-rwxr-xr-xtest/config.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/test/config.sh b/test/config.sh
index a2b69c8fa8..acc107257b 100755
--- a/test/config.sh
+++ b/test/config.sh
@@ -64,9 +64,12 @@ TRAFFIC_CAPTURE_DURATION=60
# if you need promiscuous mode, comment this line out
TRAFFIC_CAPTURE_PROMISC=-p
-# only test capturing from a fifo if we have a mkfifo
-# (it's not available on Windows or cygwin)
-if which mkfifo &>/dev/null ; then
+# only test capturing from a fifo if we're not on Windows
+# and we have a mkfifo. (Windows cygwin has a mkfifo but
+# Windows dumpcap & etc use Windows named pipes which
+# are different than the cygwin named pipes).
+#
+if [ "$WS_SYSTEM" != "Windows" ] && which mkfifo &>/dev/null ; then
TEST_FIFO=1
fi