diff --git a/testing/istate/README b/testing/istate/README
deleted file mode 100644
index 78e855074f..0000000000
--- a/testing/istate/README
+++ /dev/null
@@ -1,11 +0,0 @@
-To run these tests, invoke:
-
- ./istate.py
-
-To see differences leading to test failures, invoke:
-
- ./istate.py -s
-
-Build a new test baseline using:
-
- ./istate.py -b
diff --git a/testing/istate/base/bro-ping/remote.log b/testing/istate/base/bro-ping/remote.log
deleted file mode 100644
index 4f86bd62d6..0000000000
--- a/testing/istate/base/bro-ping/remote.log
+++ /dev/null
@@ -1,17 +0,0 @@
-xxxxxxxxxx.xxxxxx [info] [parent] pipe's socket buffer size is 8192, setting to 1048576
-xxxxxxxxxx.xxxxxx [info] [parent] communication started, parent
-xxxxxxxxxx.xxxxxx [info] [child] listening on 0.0.0.0:47758 (clear)
-xxxxxxxxxx.xxxxxx [info] [child] [#10000/] accepted clear connection
-xxxxxxxxxx.xxxxxx [info] [parent] [#10000/] added peer
-xxxxxxxxxx.xxxxxx [info] [parent] [#10000/] peer connected
-xxxxxxxxxx.xxxxxx [info] [parent] [#10000/] phase: version
-xxxxxxxxxx.xxxxxx [info] [script] [#10000/] connection established
-xxxxxxxxxx.xxxxxx [info] [script] [#10000/] requesting events matching /^?(ping)$?/
-xxxxxxxxxx.xxxxxx [info] [script] [#10000/] accepting state
-xxxxxxxxxx.xxxxxx [info] [script] [#10000/] requesting synchronized state
-xxxxxxxxxx.xxxxxx [info] [parent] [#10000/] phase: handshake
-xxxxxxxxxx.xxxxxx [info] [parent] [#10000/] registered for event pong
-xxxxxxxxxx.xxxxxx [info] [parent] [#10000/] peer does not support 64bit PIDs; using compatibility mode
-xxxxxxxxxx.xxxxxx [info] [parent] [#10000/] phase: sync (receiver)
-xxxxxxxxxx.xxxxxx [info] [parent] [#10000/] phase: running
-xxxxxxxxxx.xxxxxx [info] [parent] [#10000/] closing connection
diff --git a/testing/istate/base/bro-ping/stderr.log b/testing/istate/base/bro-ping/stderr.log
deleted file mode 100644
index bb611b7eb0..0000000000
--- a/testing/istate/base/bro-ping/stderr.log
+++ /dev/null
@@ -1,3 +0,0 @@
-xxxxxxxxxx.xxxxxx processing suspended
-xxxxxxxxxx.xxxxxx processing continued
-xxxxxxxxxx.xxxxxx received termination signal
diff --git a/testing/istate/base/bro-ping/stdout.log b/testing/istate/base/bro-ping/stdout.log
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/testing/istate/base/broccoli-ping/stderr.log b/testing/istate/base/broccoli-ping/stderr.log
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/testing/istate/base/broccoli-ping/stdout.log b/testing/istate/base/broccoli-ping/stdout.log
deleted file mode 100644
index 6174e6cce8..0000000000
--- a/testing/istate/base/broccoli-ping/stdout.log
+++ /dev/null
@@ -1,5 +0,0 @@
-pong event from 127.0.0.1: seq=0,
-pong event from 127.0.0.1: seq=1,
-pong event from 127.0.0.1: seq=2,
-pong event from 127.0.0.1: seq=3,
-pong event from 127.0.0.1: seq=4,
diff --git a/testing/istate/base/events-display/stdout.log b/testing/istate/base/events-display/stdout.log
deleted file mode 100644
index a68f969a3c..0000000000
--- a/testing/istate/base/events-display/stdout.log
+++ /dev/null
@@ -1,36 +0,0 @@
-Event [xxxxxxxxxx.xxxxxx] bro_done()
-Event [xxxxxxxxxx.xxxxxx] connection_established([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=0, state=4], resp=[size=0, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.182510137557983, service={}, addl="", hot=0, history="Sh"])
-Event [xxxxxxxxxx.xxxxxx] connection_finished([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=5], resp=[size=9417, state=5], start_time=xxxxxxxxxx.xxxxxx, duration=1.73330307006836, service={}, addl="%events-send-1", hot=0, history="ShADdFaf"])
-Event [xxxxxxxxxx.xxxxxx] connection_pending([id=[orig_h=141.42.64.125, orig_p=56729/tcp, resp_h=125.190.109.199, resp_p=12345/tcp], orig=[size=0, state=1], resp=[size=0, state=6], start_time=xxxxxxxxxx.xxxxxx, duration=0.182432889938354, service={}, addl="", hot=0, history="Sr"])
-Event [xxxxxxxxxx.xxxxxx] connection_state_remove([id=[orig_h=141.42.64.125, orig_p=56729/tcp, resp_h=125.190.109.199, resp_p=12345/tcp], orig=[size=0, state=1], resp=[size=0, state=6], start_time=xxxxxxxxxx.xxxxxx, duration=0.182432889938354, service={}, addl="", hot=0, history="Sr"])
-Event [xxxxxxxxxx.xxxxxx] connection_state_remove([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=5], resp=[size=9417, state=5], start_time=xxxxxxxxxx.xxxxxx, duration=1.73330307006836, service={}, addl="%events-send-1", hot=0, history="ShADdFaf"])
-Event [xxxxxxxxxx.xxxxxx] http_begin_entity([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=0, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.183290958404541, service={}, addl="%events-send-1", hot=0, history="ShAD"]T)
-Event [xxxxxxxxxx.xxxxxx] http_begin_entity([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=1448, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.367331027984619, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShADd"]F)
-Event [xxxxxxxxxx.xxxxxx] http_content_type([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=0, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.183290958404541, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShAD"]T"TEXT""PLAIN")
-Event [xxxxxxxxxx.xxxxxx] http_content_type([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=1448, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.367331027984619, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShADd"]F"TEXT""HTML")
-Event [xxxxxxxxxx.xxxxxx] http_end_entity([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=0, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.183290958404541, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShAD"]T)
-Event [xxxxxxxxxx.xxxxxx] http_end_entity([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=9417, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.73563814163208, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShADd"]F)
-Event [xxxxxxxxxx.xxxxxx] http_entity_data([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=5792, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.551820039749146, service={}, addl="%events-send-1", hot=0, history="ShADd"]F4096"^J
ICIR^J^J
^J^JICIR (The ICSI Center for Internet Research)^Jis a ^Jnon-profit^Jresearch institute at^JICSI^Jin ^JBerkeley, ^JCalifornia.
^JFor the three years from 1999 to 2001 we were named^JACIRI, the AT&T Center for Internet Research at ICSI, ^Jand were funded by AT&T.
^J^JThe goals of ICIR are to:^J
^J- Pursue research on the Internet architecture and related networking issues,^J
- ^JParticipate actively in the research (SIGCOMM and IRTF) and^Jstandards (IETF) communities,^J
- Bridge the gap between the Internet research community and commercial ^Jinterests by providing a neutral forum where topics of mutual technical ^Jinterest can be addressed.^J
^J^J^J
^J^J^J^J
^J^J^J^J^J^JPeople^J^J^J^J | ^J^J^J^JPublications^J^J^J^J^JProjects ^J^J^J^J^J | ^J^J^J ^JResearch^J Transport and Congestion^J^J^J Traffic and Topology^J^J- ^JIDMaps ^J(Internet Distance Mapping).^J
- The ^JInternet Traffic Archive.^J
- ^JMINC^J(Multicast-based Inference of Network-internal Characteristics).^J
- ^JNIMI^J(N")
-Event [xxxxxxxxxx.xxxxxx] http_entity_data([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=9417, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.73563814163208, service={}, addl="%events-send-1", hot=0, history="ShADd"]F938"ational Internet Measurement Infrastructure).^J
^J^J^J^J^J^J | ^J^J
^J
^J
^J^J
^J^J
^JLast modified: June 2004. Copyright notice.^J^JOlder versions of this web page, in its ACIRI incarnation..^J
^JFor more information about this server, mail www@aciri.org. ^J
^JTo report unusual activity by any of our hosts, mail abuse@aciri.org.^J^J")
-Event [xxxxxxxxxx.xxxxxx] http_header([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=0, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.183290958404541, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShAD"]T"ACCEPT""*/*")
-Event [xxxxxxxxxx.xxxxxx] http_header([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=0, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.183290958404541, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShAD"]T"CONNECTION""Keep-Alive")
-Event [xxxxxxxxxx.xxxxxx] http_header([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=0, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.183290958404541, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShAD"]T"HOST""www.icir.org")
-Event [xxxxxxxxxx.xxxxxx] http_header([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=0, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.183290958404541, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShAD"]T"USER-AGENT""Wget/1.10")
-Event [xxxxxxxxxx.xxxxxx] http_header([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=1448, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.367331027984619, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShADd"]F"ACCEPT-RANGES""bytes")
-Event [xxxxxxxxxx.xxxxxx] http_header([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=1448, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.367331027984619, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShADd"]F"CONNECTION""Keep-Alive")
-Event [xxxxxxxxxx.xxxxxx] http_header([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=1448, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.367331027984619, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShADd"]F"CONTENT-LENGTH""9130")
-Event [xxxxxxxxxx.xxxxxx] http_header([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=1448, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.367331027984619, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShADd"]F"CONTENT-TYPE""text/html")
-Event [xxxxxxxxxx.xxxxxx] http_header([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=1448, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.367331027984619, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShADd"]F"DATE""Fri, 07 Oct 2005 23:23:55 GMT")
-Event [xxxxxxxxxx.xxxxxx] http_header([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=1448, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.367331027984619, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShADd"]F"ETAG"""2c96c-23aa-4346a0e5"")
-Event [xxxxxxxxxx.xxxxxx] http_header([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=1448, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.367331027984619, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShADd"]F"KEEP-ALIVE""timeout=15, max=100")
-Event [xxxxxxxxxx.xxxxxx] http_header([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=1448, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.367331027984619, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShADd"]F"LAST-MODIFIED""Fri, 07 Oct 2005 16:23:01 GMT")
-Event [xxxxxxxxxx.xxxxxx] http_header([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=1448, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.367331027984619, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShADd"]F"SERVER""Apache/1.3.33 (Unix)")
-Event [xxxxxxxxxx.xxxxxx] http_message_done([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=0, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.183290958404541, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShAD"]T[start=xxxxxxxxxx.xxxxxx, interrupted=F, finish_msg="message ends normally", body_length=0, content_gap_length=0, header_length=86])
-Event [xxxxxxxxxx.xxxxxx] http_message_done([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=9417, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.73563814163208, service={}, addl="%events-send-1 %events-rcv-1", hot=0, history="ShADd"]F[start=xxxxxxxxxx.xxxxxx, interrupted=F, finish_msg="message ends normally", body_length=9130, content_gap_length=0, header_length=265])
-Event [xxxxxxxxxx.xxxxxx] http_reply([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=1448, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.367331027984619, service={}, addl="%events-send-1", hot=0, history="ShADd"]"1.1"200"OK")
-Event [xxxxxxxxxx.xxxxxx] http_request([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=0, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.183290958404541, service={}, addl="", hot=0, history="ShAD"]"GET""/""/""1.0")
-Event [xxxxxxxxxx.xxxxxx] net_done(xxxxxxxxxx.xxxxxx)
-Event [xxxxxxxxxx.xxxxxx] new_connection([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=0, state=0], resp=[size=0, state=0], start_time=xxxxxxxxxx.xxxxxx, duration=0.0, service={}, addl="", hot=0, history=""])
-Event [xxxxxxxxxx.xxxxxx] new_connection([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=0, state=1], resp=[size=0, state=0], start_time=xxxxxxxxxx.xxxxxx, duration=0.0, service={}, addl="cc=1", hot=0, history=""])
-Event [xxxxxxxxxx.xxxxxx] protocol_confirmation([id=[orig_h=141.42.64.125, orig_p=56730/tcp, resp_h=125.190.109.199, resp_p=80/tcp], orig=[size=98, state=4], resp=[size=0, state=4], start_time=xxxxxxxxxx.xxxxxx, duration=0.183290958404541, service={}, addl="", hot=0, history="ShAD"]165)
diff --git a/testing/istate/base/events-rcv/conn.log b/testing/istate/base/events-rcv/conn.log
deleted file mode 100644
index b38c0a2e70..0000000000
--- a/testing/istate/base/events-rcv/conn.log
+++ /dev/null
@@ -1,2 +0,0 @@
-xxxxxxxxxx.xxxxxx 0.182433 141.42.64.125 125.190.109.199 other 56729 12345 tcp ? ? REJ X
-xxxxxxxxxx.xxxxxx 1.733303 141.42.64.125 125.190.109.199 http 56730 80 tcp 98 9417 SF X %events-send-1
diff --git a/testing/istate/base/events-rcv/http.log b/testing/istate/base/events-rcv/http.log
deleted file mode 100644
index db049772d8..0000000000
--- a/testing/istate/base/events-rcv/http.log
+++ /dev/null
@@ -1,18 +0,0 @@
-xxxxxxxxxx.xxxxxx %events-rcv-1 start 141.42.64.125:56730 > 125.190.109.199:80
-xxxxxxxxxx.xxxxxx %events-rcv-1 > USER-AGENT: Wget/1.10
-xxxxxxxxxx.xxxxxx %events-rcv-1 > ACCEPT: */*
-xxxxxxxxxx.xxxxxx %events-rcv-1 > HOST: www.icir.org
-xxxxxxxxxx.xxxxxx %events-rcv-1 > CONNECTION: Keep-Alive
-xxxxxxxxxx.xxxxxx %events-rcv-1 < DATE: Fri, 07 Oct 2005 23:23:55 GMT
-xxxxxxxxxx.xxxxxx %events-rcv-1 < SERVER: Apache/1.3.33 (Unix)
-xxxxxxxxxx.xxxxxx %events-rcv-1 < LAST-MODIFIED: Fri, 07 Oct 2005 16:23:01 GMT
-xxxxxxxxxx.xxxxxx %events-rcv-1 < ETAG: "2c96c-23aa-4346a0e5"
-xxxxxxxxxx.xxxxxx %events-rcv-1 < ACCEPT-RANGES: bytes
-xxxxxxxxxx.xxxxxx %events-rcv-1 < CONTENT-LENGTH: 9130
-xxxxxxxxxx.xxxxxx %events-rcv-1 < KEEP-ALIVE: timeout=15, max=100
-xxxxxxxxxx.xxxxxx %events-rcv-1 < CONNECTION: Keep-Alive
-xxxxxxxxxx.xxxxxx %events-rcv-1 < CONTENT-TYPE: text/html
-xxxxxxxxxx.xxxxxx %events-rcv-1 <= 4096 bytes: "^J^J^JPublications^J
^J^J 125.190.109.199:80
-xxxxxxxxxx.xxxxxx %events-send-1 > USER-AGENT: Wget/1.10
-xxxxxxxxxx.xxxxxx %events-send-1 > ACCEPT: */*
-xxxxxxxxxx.xxxxxx %events-send-1 > HOST: www.icir.org
-xxxxxxxxxx.xxxxxx %events-send-1 > CONNECTION: Keep-Alive
-xxxxxxxxxx.xxxxxx %events-send-1 < DATE: Fri, 07 Oct 2005 23:23:55 GMT
-xxxxxxxxxx.xxxxxx %events-send-1 < SERVER: Apache/1.3.33 (Unix)
-xxxxxxxxxx.xxxxxx %events-send-1 < LAST-MODIFIED: Fri, 07 Oct 2005 16:23:01 GMT
-xxxxxxxxxx.xxxxxx %events-send-1 < ETAG: "2c96c-23aa-4346a0e5"
-xxxxxxxxxx.xxxxxx %events-send-1 < ACCEPT-RANGES: bytes
-xxxxxxxxxx.xxxxxx %events-send-1 < CONTENT-LENGTH: 9130
-xxxxxxxxxx.xxxxxx %events-send-1 < KEEP-ALIVE: timeout=15, max=100
-xxxxxxxxxx.xxxxxx %events-send-1 < CONNECTION: Keep-Alive
-xxxxxxxxxx.xxxxxx %events-send-1 < CONTENT-TYPE: text/html
-xxxxxxxxxx.xxxxxx %events-send-1 <= 4096 bytes: "^J^J^JPublications^J
^J^J 2
- xxxxxxxxxx.xxxxxx
- 120.0
-False False
-1.5 1.5
-'Servus' Servus
- 5555/tcp
- 6.7.6.5
- X.X.X
- 192.168.0.0/16
-==== record 1 ====
-
-42 42
-'6.6.7.7' 6.6.7.7
-==== record 2 ====
-
-99 99
-'3.4.5.1' 3.4.5.1
diff --git a/testing/istate/base/sync-rcv/remote.log b/testing/istate/base/sync-rcv/remote.log
deleted file mode 100644
index 01c0aa34cc..0000000000
--- a/testing/istate/base/sync-rcv/remote.log
+++ /dev/null
@@ -1,21 +0,0 @@
-xxxxxxxxxx.xxxxxx [info] [parent] raised pipe's socket buffer size from 126K to 1024K
-xxxxxxxxxx.xxxxxx [info] [parent] communication started, parent
-xxxxxxxxxx.xxxxxx [info] [parent] [#1/127.0.0.1:47757] added peer
-xxxxxxxxxx.xxxxxx [info] [child] [#1/127.0.0.1:47757] connected
-xxxxxxxxxx.xxxxxx [info] [parent] [#1/127.0.0.1:47757] peer connected
-xxxxxxxxxx.xxxxxx [info] [parent] [#1/127.0.0.1:47757] phase: version
-xxxxxxxxxx.xxxxxx [info] [script] [#1/127.0.0.1:47757] connection established
-xxxxxxxxxx.xxxxxx [info] [script] [#1/127.0.0.1:47757] requesting events matching /^?(.*)$?/
-xxxxxxxxxx.xxxxxx [info] [script] [#1/127.0.0.1:47757] accepting state
-xxxxxxxxxx.xxxxxx [info] [script] [#1/127.0.0.1:47757] requesting synchronized state
-xxxxxxxxxx.xxxxxx [info] [parent] [#1/127.0.0.1:47757] phase: handshake
-xxxxxxxxxx.xxxxxx [info] [parent] [#1/127.0.0.1:47757] peer_description is not set
-xxxxxxxxxx.xxxxxx [info] [parent] [#1/127.0.0.1:47757] peer supports keep-in-cache; using that
-xxxxxxxxxx.xxxxxx [info] [parent] [#1/127.0.0.1:47757] phase: sync (sender)
-xxxxxxxxxx.xxxxxx [info] [parent] [#1/127.0.0.1:47757] starting to send full state
-xxxxxxxxxx.xxxxxx [info] [parent] [#1/127.0.0.1:47757] done sending full state
-xxxxxxxxxx.xxxxxx [info] [parent] [#1/127.0.0.1:47757] phase: running
-xxxxxxxxxx.xxxxxx [info] [script] [#1/127.0.0.1:47757] connection closed
-xxxxxxxxxx.xxxxxx [info] [parent] [#1/127.0.0.1:47757] peer disconnected
-xxxxxxxxxx.xxxxxx [info] [child] [#1/127.0.0.1:47757] connection closed
-xxxxxxxxxx.xxxxxx [info] [parent] [#1/127.0.0.1:47757] closing connection
diff --git a/testing/istate/base/sync-rcv/stderr.log b/testing/istate/base/sync-rcv/stderr.log
deleted file mode 100644
index 788f8009fe..0000000000
--- a/testing/istate/base/sync-rcv/stderr.log
+++ /dev/null
@@ -1 +0,0 @@
-xxxxxxxxxx.xxxxxx received termination signal
diff --git a/testing/istate/base/sync-rcv/stdout.log b/testing/istate/base/sync-rcv/stdout.log
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/testing/istate/base/sync-rcv/vars.log b/testing/istate/base/sync-rcv/vars.log
deleted file mode 100644
index a86d2a82da..0000000000
--- a/testing/istate/base/sync-rcv/vars.log
+++ /dev/null
@@ -1,34 +0,0 @@
-421
-1234567
-Jodel
-4.3.2.1
-4.0.0.0/8
-21.0
-192.150.186
-42.0 secs
-{
-[3] = asdfg1,
-[1] = asdfg2
-}
-file "test2" of string
-/^?(abbcdefgh)$?/
-{
-3,
-5,
-6,
-4,
-2
-}
-{
-[4, JKL] = 104,
-[2, DEF] = 103,
-[3, GHI] = 103
-}
-{
-[12345] = /^?(12345)$?/,
-[6767] = /^?(QWERTZ)$?/,
-[12346] = /^?(12345)$?/
-}
-6667/tcp
-[2, 20, 3, 4]
-[a=zxzxzx, b=[a=pop, b=43, c=9.999], c=[a=IOIOI, b=201, c=612.2], d=6.6666]
diff --git a/testing/istate/base/sync-send/stderr.log b/testing/istate/base/sync-send/stderr.log
deleted file mode 100644
index 4f2df4e549..0000000000
--- a/testing/istate/base/sync-send/stderr.log
+++ /dev/null
@@ -1,2 +0,0 @@
-xxxxxxxxxx.xxxxxx processing suspended
-xxxxxxxxxx.xxxxxx processing continued
diff --git a/testing/istate/base/sync-send/stdout.log b/testing/istate/base/sync-send/stdout.log
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/testing/istate/base/sync-send/vars.log b/testing/istate/base/sync-send/vars.log
deleted file mode 100644
index a86d2a82da..0000000000
--- a/testing/istate/base/sync-send/vars.log
+++ /dev/null
@@ -1,34 +0,0 @@
-421
-1234567
-Jodel
-4.3.2.1
-4.0.0.0/8
-21.0
-192.150.186
-42.0 secs
-{
-[3] = asdfg1,
-[1] = asdfg2
-}
-file "test2" of string
-/^?(abbcdefgh)$?/
-{
-3,
-5,
-6,
-4,
-2
-}
-{
-[4, JKL] = 104,
-[2, DEF] = 103,
-[3, GHI] = 103
-}
-{
-[12345] = /^?(12345)$?/,
-[6767] = /^?(QWERTZ)$?/,
-[12346] = /^?(12345)$?/
-}
-6667/tcp
-[2, 20, 3, 4]
-[a=zxzxzx, b=[a=pop, b=43, c=9.999], c=[a=IOIOI, b=201, c=612.2], d=6.6666]
diff --git a/testing/istate/istate.py b/testing/istate/istate.py
deleted file mode 100755
index 72b3eb4288..0000000000
--- a/testing/istate/istate.py
+++ /dev/null
@@ -1,174 +0,0 @@
-#! /usr/bin/env python
-#
-# Tests persistence.
-#
-# $Id: istate.py,v 1.1.2.4 2005/10/11 22:31:42 sommer Exp $
-
-import time
-import os
-import os.path
-import optparse
-import sys
-import subprocess
-
-import tests
-
-optparser = optparse.OptionParser( usage = "%prog [options]", version = "0.1" )
-optparser.add_option( "-s", "--show-diff", action = "store_true", dest = "showdiff",
- default = False, help = "show diffs of mismatches" )
-optparser.add_option( "-b", "--new-base", action = "store_true", dest = "newbase",
- default = False, help = "create new baseline" )
-optparser.add_option( "-d", "--debug", action = "store_true", dest = "debug",
- default = False, help = "enable debug output" )
-optparser.add_option( "-t", "--set", action = "store", type = "string", dest = "set",
- default = None, help = "only do given test set" )
-
-
-( tests.Options, args ) = optparser.parse_args()
-
-if len(args) != 0:
- optparser.error( "Wrong number of arguments" )
-
-##########################################
-# Write persistent data and read it back.
-##########################################
-
-if tests.testSet("persistence"):
-
- tests.spawnBro("persistence-write",
- ["-r", os.path.join(tests.Traces, "empty.trace"),
- os.path.join(tests.Scripts, "vars-init.bro"),
- os.path.join(tests.Scripts, "vars-print.bro")])
- tests.waitProc("persistence-write")
- tests.finishTest("persistence-write", ["stdout.log", "stderr.log", "vars.log"])
-
- tests.spawnBro("persistence-read",
- [os.path.join(tests.Scripts, "vars-declare.bro"),
- os.path.join(tests.Scripts, "vars-print.bro")],
- copy=[os.path.join(tests.workDir("persistence-write"), ".state")])
- tests.waitProc("persistence-read")
- tests.finishTest("persistence-read", ["stdout.log", "stderr.log", "vars.log"])
-
- tests.compareFiles("persistence-write", "persistence-read", ["vars.log"])
-
-##########################################
-# Exchange events (clear-text).
-#
-# The used trace contains two connections separated by a silence of a
-# couple of seconds. We start the processes so that the events for the
-# *second* one (which is a full HTTP connection) are exchanged.
-##########################################
-
-if tests.testSet("events"):
-
- tests.spawnBro("events-send",
- ["-r", os.path.join(tests.Scripts, os.path.join(tests.Traces, "web.trace")),
- "--pseudo-realtime",
- "-C",
- os.path.join(tests.Scripts, "events-send.bro")])
- time.sleep(2)
- tests.spawnBro("events-rcv",
- [os.path.join(tests.Scripts, "events-rcv.bro")])
- tests.waitProc("events-send")
- tests.killProc("events-rcv")
- tests.finishTest("events-send", ["stdout.log", "stderr.log", "http.log", "conn.log"], ignoreTime=True)
- tests.finishTest("events-rcv", ["stdout.log", "stderr.log", "http.log", "conn.log"], ignoreTime=True)
-
- tests.spawnBro("events-display",
- ["-x", os.path.join(tests.workDir("events-rcv"), "events.bst")])
- tests.waitProc("events-display")
- tests.finishTest("events-display", ["stdout.log"], ignoreTime=True, sort=True, delete=['127.0.0.1:[0-9]*',"Event.*remote_.*"])
-
- tests.compareFiles("events-send", "events-rcv", ["http.log"], ignoreTime=True, ignoreSessionID=True)
-
-##########################################
-# Exchange synchronized state
-##########################################
-
-if tests.testSet("sync"):
-
- tests.spawnBro("sync-send",
- [os.path.join(tests.Scripts, "vars-sync-send.bro")])
- tests.spawnBro("sync-rcv",
- [os.path.join(tests.Scripts, "vars-sync-rcv.bro")])
- tests.waitProc("sync-send")
- time.sleep(1)
- tests.killProc("sync-rcv")
- tests.finishTest("sync-send", ["stdout.log", "stderr.log", "vars.log"], ignoreTime=True)
- tests.finishTest("sync-rcv", ["stdout.log", "stderr.log", "vars.log", "remote.log"], ignoreTime=True, delete=["pid.*pid.*", "temporarily unavailable \\[..\\]"])
-
- tests.compareFiles("sync-send", "sync-rcv", ["vars.log"], ignoreTime=True)
-
-# Old version
-# tests.spawnBro("sync-send",
-# ["-r", os.path.join(tests.Scripts, os.path.join(tests.Traces, "web.trace")),
-# "--pseudo-realtime",
-# "-C",
-# os.path.join(tests.Scripts, "vars-sync-send.bro")])
-
-##########################################
-# Test Broccoli with bro-ping
-##########################################
-
-
-if tests.testSet("broccoli"):
-
- broctest = os.path.join(tests.BroBase, "aux/broccoli/test")
- broclib = os.path.join(tests.BroBase, "build/aux/broccoli/src/")
- broping = os.path.join(tests.BroBase, "build/aux/broccoli/test/broping")
-
- brocpy = os.path.join(tests.BroBase, "build/aux/broccoli/bindings/broccoli-python")
-
- broccoli = True
-
- # Test if Broccoli was compiled.
- if not os.path.exists(broping):
- print " Broccoli was not compiled, skipping tests."
- broccoli = False
-
- # Test if this is a IPv6 Bro.
- if broccoli:
- v6 = subprocess.call(["grep", "-q", "#define BROv6", os.path.join(tests.BroBase, "build/config.h")])
- if v6 == 0:
- print " Bro built with IPv6 support not compatible with Broccoli, skipping tests."
- broccoli = False
-
- if broccoli:
- tests.spawnBro("bro-ping", [os.path.join(broctest, "broping-record.bro")])
- time.sleep(1)
- tests.spawnProc("broccoli-ping",
- [broping,
- "-r",
- "-c", "5",
- "127.0.0.1"])
- tests.waitProc("broccoli-ping")
- tests.killProc("bro-ping")
-
- tests.finishTest("bro-ping", ["stdout.log", "stderr.log", "remote.log"],
- ignoreTime=True, delete=["127.0.0.1:[0-9]*", "pid.*pid.*",
- ".*Resource temporarily unavailable.*", ".*connection closed.*",
- ".*peer disconnected.*"])
- tests.finishTest("broccoli-ping", ["stdout.log", "stderr.log"],
- delete=["time=.* s$"])
-
- # Test if Python binding are installed.
- sopath = subprocess.Popen(["find", brocpy, "-name", "_broccoli_intern.so"], stdout=subprocess.PIPE).communicate()[0]
- if sopath != "":
-
- os.environ["LD_LIBRARY_PATH"] = broclib
- os.environ["DYLD_LIBRARY_PATH"] = broclib
- os.environ["PYTHONPATH"] = os.path.dirname(sopath)
-
- tests.spawnBro("python-bro", [os.path.join(brocpy, "tests/test.bro")])
- time.sleep(1)
- tests.spawnProc("python-script", [os.path.join(brocpy, "tests/test.py")])
- tests.waitProc("python-script")
- tests.killProc("python-bro")
- tests.finishTest("python-bro", ["stdout.log"], ignoreTime=True)
- tests.finishTest("python-script", ["stdout.log"], ignoreTime=True, delete=["0x[^>]*", ".[0-9]{2}"])
- else:
- print " Python bindings not built, skipping test."
- print " (To build: cd %s && python setup.py build)" % brocpy
-
-
-
diff --git a/testing/istate/rndseed.dat b/testing/istate/rndseed.dat
deleted file mode 100644
index 3bc70c899b..0000000000
--- a/testing/istate/rndseed.dat
+++ /dev/null
@@ -1,17 +0,0 @@
-1971283154
-1128552575
-26676
-875311974
-790730425
-1553617948
-3593004090
-2070230499
-1420669195
-754343139
-2906181924
-542878596
-2459738795
-924396623
-743111462
-3363354015
-198575356
diff --git a/testing/istate/scripts/events-rcv.bro b/testing/istate/scripts/events-rcv.bro
deleted file mode 100644
index a345e3fa49..0000000000
--- a/testing/istate/scripts/events-rcv.bro
+++ /dev/null
@@ -1,18 +0,0 @@
-# $Id: events-rcv.bro,v 1.1.2.1 2005/10/07 01:59:12 sommer Exp $
-
-@load tcp
-@load http-request
-@load http-reply
-@load http-header
-@load http-body
-@load http-abstract
-
-@load capture-events
-@load remote
-
-redef peer_description = "events-rcv";
-
-redef Remote::destinations += {
- ["foo"] = [$host = 127.0.0.1, $events = /.*/, $connect=T]
-};
-
diff --git a/testing/istate/scripts/events-send.bro b/testing/istate/scripts/events-send.bro
deleted file mode 100644
index 00975fd723..0000000000
--- a/testing/istate/scripts/events-send.bro
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: events-send.bro,v 1.1.2.1 2005/10/07 01:59:12 sommer Exp $
-
-@load tcp
-@load http-request
-@load http-reply
-@load http-header
-@load http-body
-@load http-abstract
-@load listen-clear
-
-@load capture-events
-
-redef peer_description = "events-send";
-
-# Make sure the HTTP connection really gets out.
-# (We still miss one final connection event because we shutdown before
-# it gets propagated but that's ok.)
-redef tcp_close_delay = 0secs;
-
-
-
diff --git a/testing/istate/scripts/vars-declare.bro b/testing/istate/scripts/vars-declare.bro
deleted file mode 100644
index 871e518109..0000000000
--- a/testing/istate/scripts/vars-declare.bro
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: vars-declare.bro,v 1.1.2.2 2005/10/11 21:15:05 sommer Exp $
-#
-# Declares variables.
-
-global foo1: count &persistent &synchronized;
-global foo2: int &persistent &synchronized;
-global foo3: string &persistent &synchronized;
-global foo4: addr &persistent &synchronized;
-global foo5: subnet &persistent &synchronized;
-global foo6: double &persistent &synchronized;
-global foo7: net &persistent &synchronized;
-global foo8: interval &persistent &synchronized;
-global foo9: table[count] of string &persistent &synchronized;
-global foo10: file &persistent &synchronized;
-global foo11: pattern &persistent &synchronized;
-global foo12: set[count] &persistent &synchronized;
-global foo13: table[count, string] of count &persistent &synchronized;
-global foo14: table[count] of pattern &persistent &synchronized;
-global foo15: port &persistent &synchronized;
-global foo16: vector of count &persistent &synchronized;
-
-type type1: record {
- a: string;
- b: count &default=42;
- c: double &optional;
- };
-
-type type2: record {
- a: string;
- b: type1;
- c: type1;
- d: double;
- };
-
-global foo17: type2 &persistent &synchronized;
-
diff --git a/testing/istate/scripts/vars-init.bro b/testing/istate/scripts/vars-init.bro
deleted file mode 100644
index 79b1345f31..0000000000
--- a/testing/istate/scripts/vars-init.bro
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: vars-init.bro,v 1.1.2.2 2005/10/11 21:15:05 sommer Exp $
-#
-# Instantiates variables.
-
-global foo1 = 42 &persistent &synchronized;
-global foo2 = -42 &persistent &synchronized;
-global foo3 = "Hallihallo" &persistent &synchronized;
-global foo4 = 1.2.3.4 &persistent &synchronized;
-global foo5 = 1.2.0.0/16 &persistent &synchronized;
-global foo6 = 3.14 &persistent &synchronized;
-global foo7 = 131.159. &persistent &synchronized;
-global foo8 = 42 secs &persistent &synchronized;
-global foo9 = { [1] = "qwerty", [2] = "uiop" } &persistent &synchronized;
-global foo10 = open("test") &persistent &synchronized;
-global foo11 = /12345/ &persistent &synchronized;
-global foo12 = { 1,2,3,4,5 } &persistent &synchronized;
-global foo13 = { [1,"ABC"] = 101, [2,"DEF"] = 102, [3,"GHI"] = 103 } &persistent &synchronized;
-global foo14 = { [12345] = foo11, [12346] = foo11 } &persistent &synchronized;
-global foo15 = 42/udp &persistent &synchronized;
-global foo16: vector of count = [1,2,3] &persistent &synchronized;
-
-type type1: record {
- a: string;
- b: count &default=42;
- c: double &optional;
- };
-
-type type2: record {
- a: string;
- b: type1;
- c: type1;
- d: double;
- };
-
-global foo17: type2 = [
- $a = "yuyuyu",
- $b = [$a="rec1", $b=100, $c=1.24],
- $c = [$a="rec2", $b=200, $c=2.24],
- $d = 7.77
- ] &persistent &synchronized;
-
-
diff --git a/testing/istate/scripts/vars-modify.bro b/testing/istate/scripts/vars-modify.bro
deleted file mode 100644
index 51f723f90d..0000000000
--- a/testing/istate/scripts/vars-modify.bro
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: vars-modify.bro,v 1.1.2.2 2005/10/11 21:15:05 sommer Exp $
-#
-# Performs modifications on variables.
-
-function modify()
- {
- foo1 = 420;
- ++foo1;
-
- --foo2;
-
- foo3 = "Jodel";
-
- foo4 = 4.3.2.1;
-
- foo5 = 4.0.0.0/8;
-
- foo6 = 21;
-
- foo7 = 192.150.186;
-
- foo9[3] = "asdfg1";
- foo9[1] = "asdfg2";
- delete foo9[2];
-
- foo10 = open("test2");
-
- foo11 = /abbcdefgh/;
-
- add foo12[6];
- delete foo12[1];
-
- foo13[4,"JKL"] = 104;
- delete foo13[1,"ABC"];
- ++foo13[2,"DEF"];
-
- foo14[6767] = /QWERTZ/;
-
- foo15 = 6667/tcp;
-
- foo16[4] = 4;
- foo16[2] = 20;
- ++foo16[1];
-
- local x: type1;
- x$a = "pop";
- ++x$b;
- x$c = 9.999;
- foo17$a = "zxzxzx";
- foo17$b = x;
- foo17$c$a = "IOIOI";
- ++foo17$c$b;
- foo17$c$c = 612.2;
- foo17$d = 6.6666;
-
- foo2 = 1234567;
- }
-
-
-
-
diff --git a/testing/istate/scripts/vars-print.bro b/testing/istate/scripts/vars-print.bro
deleted file mode 100644
index 26d846c9cc..0000000000
--- a/testing/istate/scripts/vars-print.bro
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: vars-print.bro,v 1.1.2.2 2005/10/11 21:15:05 sommer Exp $
-#
-# Print variables.
-
-event bro_done()
- {
- local out = open("vars.log");
- print out, foo1;
- print out, foo2;
- print out, foo3;
- print out, foo4;
- print out, foo5;
- print out, foo6;
- print out, foo7;
- print out, foo8;
- print out, foo9;
- print out, foo10;
- print out, foo11;
- print out, foo12;
- print out, foo13;
- print out, foo14;
- print out, foo15;
- print out, foo16;
- print out, foo17;
- }
-
-
-
-
diff --git a/testing/istate/scripts/vars-sync-rcv.bro b/testing/istate/scripts/vars-sync-rcv.bro
deleted file mode 100644
index 145afd6ff6..0000000000
--- a/testing/istate/scripts/vars-sync-rcv.bro
+++ /dev/null
@@ -1,13 +0,0 @@
-# $Id: vars-sync-rcv.bro,v 1.1.2.1 2005/10/11 21:15:05 sommer Exp $
-
-@load vars-init
-@load vars-print
-
-@load capture-events
-@load remote
-
-
-redef Remote::destinations += {
- ["foo"] = [$host = 127.0.0.1, $events = /.*/, $connect=T, $sync=T]
-};
-
diff --git a/testing/istate/scripts/vars-sync-send.bro b/testing/istate/scripts/vars-sync-send.bro
deleted file mode 100644
index 655c8a36ea..0000000000
--- a/testing/istate/scripts/vars-sync-send.bro
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: vars-sync-send.bro,v 1.1.2.1 2005/10/11 21:15:05 sommer Exp $
-#
-
-@load vars-init
-@load vars-print
-@load vars-modify
-
-@load listen-clear
-
-event remote_connection_handshake_done(p: event_peer)
- {
- modify();
- terminate_communication();
- }
-
-redef Remote::destinations += {
- ["foo"] = [$host = 127.0.0.1, $sync=T]
-};
-
-
diff --git a/testing/istate/tests.py b/testing/istate/tests.py
deleted file mode 100644
index 0673108563..0000000000
--- a/testing/istate/tests.py
+++ /dev/null
@@ -1,300 +0,0 @@
-# $Id: tests.py,v 1.1.2.5 2005/10/11 22:31:42 sommer Exp $
-#
-# Various helper functions.
-
-import sys
-import os
-import copy
-import errno
-import signal
-import subprocess
-
-# Path to our files.
-Testing = os.path.abspath(".")
-
-# Path to top-level Bro directory.
-if os.path.exists("../../build/src/bro"):
- BroBase = os.path.abspath("../..")
-else:
- error("cannot find build directory")
-
-# Path where tmp files are created.
-Tmp = os.path.join(Testing, "tmp")
-
-# Path to seed file.
-BroSeed = os.path.join(Testing, "rndseed.dat")
-
-# Path to our test scripts.
-Scripts = os.path.join(Testing, "scripts")
-
-# Path to our test traces.
-Traces = os.path.join(Testing, "traces")
-
-# Where the base files to compare against are stored.
-Base = os.path.join(os.getcwd(), "./base")
-
-# Process ID of all processes we've spawned, indexed by textual tag *and* pid.
-Running = {}
-
-# Set to true when at least one check failed.
-Failed = False
-
-# getopt options
-Options = None
-
-def error(str):
- print >>sys.stderr, "Error:", str
- sys.exit(1)
-
-def debug(str):
- if Options.debug:
- print >>sys.stderr, "Debug:", str
-
-def log(str):
- print >>sys.stderr, str
-
-# Returns full path of given process' working directory.
-def workDir(tag):
- return os.path.join(Tmp, tag)
-
-# Intializes work dir for given process.
-def initWorkDir(tag):
-
- try:
- os.mkdir(Tmp)
- except OSError, e:
- if e.errno != errno.EEXIST:
- raise
-
- os.system("rm -rf " + workDir(tag))
- os.mkdir(workDir(tag))
-
-# Spawns process identified by the given tag. Enters process into RunningBro.
-def spawnProc(tag, cmdline, copy=[]):
- initWorkDir(tag)
- os.chdir(workDir(tag))
-
- for i in copy:
- debug("Copying %s into workdir of %s" % (i, tag))
- os.system("cp -r %s %s" % (i, workDir(tag)))
-
- debug("Spawning '%s' as %s" % (" ".join(cmdline), tag))
-
- saved_stdin = os.dup(0)
- saved_stdout = os.dup(1)
- saved_stderr = os.dup(2)
- child_stdin = open("/dev/null", "r")
- child_stdout = open("stdout.log", "w")
- child_stderr = open("stderr.log", "w")
- os.dup2(child_stdin.fileno(), 0)
- os.dup2(child_stdout.fileno(), 1)
- os.dup2(child_stderr.fileno(), 2)
- pid = os.spawnvp(os.P_NOWAIT, cmdline[0], cmdline)
- os.dup2(saved_stdin, 0)
- os.dup2(saved_stdout, 1)
- os.dup2(saved_stderr, 2)
-
- Running[tag] = pid
- Running[pid] = tag
-
-# Spaws a Bro process.
-def spawnBro(tag, args, copy=[]):
- bropath = os.path.join(BroBase, "policy")
- bropath += ":" + os.path.join(BroBase, "build/src")
-
- os.putenv("BROPATH", bropath + ":" + Scripts)
- os.unsetenv("BRO_LOG_SUFFIX")
- args += ["--load-seeds", BroSeed, "-B", "state,comm"]
- spawnProc(tag, [os.path.join(BroBase, "build/src/bro")] + args, copy=copy)
-
-# Examines a process' exit code.
-def parseExitCode(tag, result):
- if os.WCOREDUMP(result):
- error("process %s core dumped." % tag)
-
- if os.WIFSIGNALED(result):
- error("process %s got signal %d." % (tag, os.WTERMSIG(result)))
-
- if not os.WIFEXITED(result):
- error("process %s exited abnormally (%d)." % (tag, result))
-
- result = os.WEXITSTATUS(result)
- debug("process %s exited with %d" % (tag, result))
-
- return result
-
-# Waits for process to finish.
-def waitProc(tag):
- (pid, result) = os.waitpid(Running[tag], 0)
- result = parseExitCode(tag, result)
- if result != 0:
- error("Execution of %s failed." % tag)
-
- del Running[pid]
- del Running[tag]
-
-# Waits for all of our processes to terminte.
-def waitProcs():
- while Running:
- (pid, result) = os.waitpid(0, 0)
- parseExitCode(Running[pid], result)
- del Running[Running[pid]]
- del Running[pid]
-
-# Kills the process and waits for its termination.
-def killProc(tag):
- pid = Running[tag]
- debug("Killing %s..." % tag)
- os.kill(pid, signal.SIGTERM)
- (pid, result) = os.waitpid(pid, 0)
- parseExitCode(tag, result)
- del Running[pid]
- del Running[tag]
-
-# Cleans up temporary stuff
-def cleanup():
- os.system("rm -rf " + Tmp)
-
-# Canonicalizes file content for diffing.
-def canonicalizeFile(file, ignoreTime, ignoreSessionID, sort, delete):
-
- cmd = []
-
- if delete:
- for i in delete:
- cmd += ["sed 's/%s//g' | grep -v '^$'" % i]
-
- if ignoreTime:
- cmd += ["sed 's/[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\.[0-9][0-9]\{0,6\}/xxxxxxxxxx.xxxxxx/g'"]
-
- if ignoreSessionID:
- # A session is either "%1" or "%my-peer-description-1"
- cmd += ["sed 's/%\([^ ]*-\)\{0,1\}[0-9][0-9]*/%XXX/g'"]
-
- if sort:
- cmd += ["LC_ALL=c sort"]
-
- if not cmd:
- return
-
- tmp = file + ".tmp"
- cmd = "cat %s | %s >%s" % (file, " | ".join(cmd), tmp)
-
- debug("Canonicalizing '%s'" % cmd)
- os.system(cmd)
- os.system("mv %s %s" % (tmp, file))
-
-# Diffs the two files, If mismatch, prints "FAILED" and returns true.
-def diff(file1, file2):
-
- quiet = ">/dev/null"
- if Options.showdiff:
- quiet = ""
-
- for f in (file1, file2):
- if not os.path.exists(f):
- print "FAILED (%s does not exist)" % f
- return False
-
- diff = "diff -u %s %s %s" % (file1, file2, quiet)
-
- debug("Executing '%s'" % diff)
- result = os.system(diff)
-
- if os.WEXITSTATUS(result) != 0:
- print "FAILED"
- return False
-
- return True
-
-# Compares files of process against base version. Returns false if mismatch found.
-def checkFiles(tag, files, ignoreTime, sort, delete):
- base = os.path.join(Base, tag)
- work = workDir(tag)
-
- print " Checking %s..." % tag,
-
- failed = False
-
- for file in files:
- oldfile = os.path.join(base, file)
- newfile = os.path.join(work, file)
-
- canonicalizeFile(newfile, ignoreTime, False, sort, delete)
-
- if not diff(oldfile, newfile):
- failed = True
- break
-
- if not failed:
- print "ok"
- else:
- Failed = failed
-
-# Compares files of two processes. Return false if mismatch found.
-def compareFiles(tag1, tag2, files, ignoreTime=False, ignoreSessionID=False, sort=False, delete=None):
- work1 = workDir(tag1)
- work2 = workDir(tag2)
-
- print " Comparing %s with %s..." % (tag1, tag2),
-
- failed = False
-
- for file in files:
- file1 = os.path.join(work1, file)
- file2 = os.path.join(work2, file)
-
- canonicalizeFile(file1, ignoreTime, ignoreSessionID, sort, delete)
- canonicalizeFile(file2, ignoreTime, ignoreSessionID, sort, delete)
-
- if not diff(file1, file2):
- failed = True
- break
-
- if not failed:
- print "ok"
- else:
- Failed = failed
-
-# Make the result of process new baseline.
-def makeNewBase(tag, files, ignoreTime, sort, delete):
-
- try:
- os.mkdir(Base)
- except OSError, e:
- if e.errno != errno.EEXIST:
- raise
-
- base = os.path.join(Base, tag)
- work = workDir(tag)
-
- print " Copying files for %s..." % tag
-
- try:
- os.mkdir(base)
- except OSError, e:
- if e.errno != errno.EEXIST:
- raise
-
- # Delete all files but those belonging to CVS.
- os.system("find %s -type f -not -path '*/CVS/*' -not -path '*/.svn/*' -exec rm '{}' ';'" % base)
-
- for file in files:
- oldfile = os.path.join(work, file)
- newfile = os.path.join(base, file)
- os.system("cp %s %s" % (oldfile, newfile))
- canonicalizeFile(newfile, ignoreTime, False, sort, delete)
-
-def testSet(set):
- if Options.set and set != Options.set:
- return False
-
- print "Running set '%s' ..." % set
- return True
-
-# Either check given files or make it new baseline, depending on options.
-def finishTest(tag, files, ignoreTime=False, sort=False, delete=None):
- if Options.newbase:
- makeNewBase(tag, files, ignoreTime, sort, delete)
- else:
- checkFiles(tag, files, ignoreTime, sort, delete)
diff --git a/testing/istate/traces/empty.trace b/testing/istate/traces/empty.trace
deleted file mode 100644
index 3ee1117122..0000000000
Binary files a/testing/istate/traces/empty.trace and /dev/null differ
diff --git a/testing/istate/traces/web.trace b/testing/istate/traces/web.trace
deleted file mode 100644
index 1651085190..0000000000
Binary files a/testing/istate/traces/web.trace and /dev/null differ