From b7bd87d9cf3971b4b56bb0421f063d971345c6fa Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Wed, 4 Nov 2020 10:24:21 -0800 Subject: [PATCH] GH-1252: rename files with colons for Windows compatibility A short-term measure so that the Zeek source tree can simply exist on a Windows filesystem. For true support, the logic that decides/generates the filename format will need to change. --- ...c-2e3e]-49185-[2001-470-4867-99--21]-21_orig.dat} | 0 ...c-2e3e]-49185-[2001-470-4867-99--21]-21_resp.dat} | 0 .../protocols/conn/contents-default-extract.test | 12 ++++++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) rename testing/btest/Baseline/scripts.base.protocols.conn.contents-default-extract/{contents_[2001:470:1f11:81f:c999:d94:aa7c:2e3e]:49185-[2001:470:4867:99::21]:21_orig.dat => contents_[2001-470-1f11-81f-c999-d94-aa7c-2e3e]-49185-[2001-470-4867-99--21]-21_orig.dat} (100%) rename testing/btest/Baseline/scripts.base.protocols.conn.contents-default-extract/{contents_[2001:470:1f11:81f:c999:d94:aa7c:2e3e]:49185-[2001:470:4867:99::21]:21_resp.dat => contents_[2001-470-1f11-81f-c999-d94-aa7c-2e3e]-49185-[2001-470-4867-99--21]-21_resp.dat} (100%) diff --git a/testing/btest/Baseline/scripts.base.protocols.conn.contents-default-extract/contents_[2001:470:1f11:81f:c999:d94:aa7c:2e3e]:49185-[2001:470:4867:99::21]:21_orig.dat b/testing/btest/Baseline/scripts.base.protocols.conn.contents-default-extract/contents_[2001-470-1f11-81f-c999-d94-aa7c-2e3e]-49185-[2001-470-4867-99--21]-21_orig.dat similarity index 100% rename from testing/btest/Baseline/scripts.base.protocols.conn.contents-default-extract/contents_[2001:470:1f11:81f:c999:d94:aa7c:2e3e]:49185-[2001:470:4867:99::21]:21_orig.dat rename to testing/btest/Baseline/scripts.base.protocols.conn.contents-default-extract/contents_[2001-470-1f11-81f-c999-d94-aa7c-2e3e]-49185-[2001-470-4867-99--21]-21_orig.dat diff --git a/testing/btest/Baseline/scripts.base.protocols.conn.contents-default-extract/contents_[2001:470:1f11:81f:c999:d94:aa7c:2e3e]:49185-[2001:470:4867:99::21]:21_resp.dat b/testing/btest/Baseline/scripts.base.protocols.conn.contents-default-extract/contents_[2001-470-1f11-81f-c999-d94-aa7c-2e3e]-49185-[2001-470-4867-99--21]-21_resp.dat similarity index 100% rename from testing/btest/Baseline/scripts.base.protocols.conn.contents-default-extract/contents_[2001:470:1f11:81f:c999:d94:aa7c:2e3e]:49185-[2001:470:4867:99::21]:21_resp.dat rename to testing/btest/Baseline/scripts.base.protocols.conn.contents-default-extract/contents_[2001-470-1f11-81f-c999-d94-aa7c-2e3e]-49185-[2001-470-4867-99--21]-21_resp.dat diff --git a/testing/btest/scripts/base/protocols/conn/contents-default-extract.test b/testing/btest/scripts/base/protocols/conn/contents-default-extract.test index 198790b2c3..deee24c7d5 100644 --- a/testing/btest/scripts/base/protocols/conn/contents-default-extract.test +++ b/testing/btest/scripts/base/protocols/conn/contents-default-extract.test @@ -1,3 +1,11 @@ # @TEST-EXEC: zeek -b -f "tcp port 21" -r $TRACES/ftp/ipv6.trace base/protocols/conn "Conn::default_extract=T" -# @TEST-EXEC: btest-diff contents_[2001:470:1f11:81f:c999:d94:aa7c:2e3e]:49185-[2001:470:4867:99::21]:21_orig.dat -# @TEST-EXEC: btest-diff contents_[2001:470:1f11:81f:c999:d94:aa7c:2e3e]:49185-[2001:470:4867:99::21]:21_resp.dat + +# Note: files renamed to remove colons due to Windows filesystem limitations. +# Allows one to clone the source tree on Windows for now. For real Windows +# runtime compatibility, the original filenames will need a different format. + +# @TEST-EXEC: mv contents_[2001:470:1f11:81f:c999:d94:aa7c:2e3e]:49185-[2001:470:4867:99::21]:21_orig.dat contents_[2001-470-1f11-81f-c999-d94-aa7c-2e3e]-49185-[2001-470-4867-99--21]-21_orig.dat +# @TEST-EXEC: mv contents_[2001:470:1f11:81f:c999:d94:aa7c:2e3e]:49185-[2001:470:4867:99::21]:21_resp.dat contents_[2001-470-1f11-81f-c999-d94-aa7c-2e3e]-49185-[2001-470-4867-99--21]-21_resp.dat + +# @TEST-EXEC: btest-diff contents_[2001-470-1f11-81f-c999-d94-aa7c-2e3e]-49185-[2001-470-4867-99--21]-21_orig.dat +# @TEST-EXEC: btest-diff contents_[2001-470-1f11-81f-c999-d94-aa7c-2e3e]-49185-[2001-470-4867-99--21]-21_resp.dat