diff --git a/testing/btest/Baseline/scripts.base.frameworks.input.missing-file/bro..stderr b/testing/btest/Baseline/scripts.base.frameworks.input.missing-file/bro..stderr index 4380007b93..5093925d2d 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.input.missing-file/bro..stderr +++ b/testing/btest/Baseline/scripts.base.frameworks.input.missing-file/bro..stderr @@ -1,5 +1,4 @@ error: does-not-exist.dat/Input::READER_ASCII: Init: cannot open does-not-exist.dat error: does-not-exist.dat/Input::READER_ASCII: Init failed -warning: Stream input is already queued for removal. Ignoring remove. error: does-not-exist.dat/Input::READER_ASCII: terminating thread received termination signal diff --git a/testing/btest/Baseline/scripts.base.frameworks.input.raw.basic/out b/testing/btest/Baseline/scripts.base.frameworks.input.raw.basic/out index fa3625ca74..0f0ddb3c98 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.input.raw.basic/out +++ b/testing/btest/Baseline/scripts.base.frameworks.input.raw.basic/out @@ -6,6 +6,7 @@ print outfile, A::s; try = try + 1; if (8 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -23,6 +24,7 @@ print outfile, A::s; try = try + 1; if (8 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -40,6 +42,7 @@ print outfile, A::s; try = try + 1; if (8 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -57,6 +60,7 @@ print outfile, A::s; try = try + 1; if (8 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -74,6 +78,7 @@ print outfile, A::s; try = try + 1; if (8 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -91,6 +96,7 @@ print outfile, A::s; try = try + 1; if (8 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -108,6 +114,7 @@ print outfile, A::s; try = try + 1; if (8 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -125,6 +132,7 @@ print outfile, A::s; try = try + 1; if (8 == try) { +Input::remove(input); close(outfile); terminate(); } diff --git a/testing/btest/Baseline/scripts.base.frameworks.input.raw.execute/out b/testing/btest/Baseline/scripts.base.frameworks.input.raw.execute/out index e08ca8ba08..edffe914dd 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.input.raw.execute/out +++ b/testing/btest/Baseline/scripts.base.frameworks.input.raw.execute/out @@ -3,6 +3,7 @@ print outfile, description; print outfile, tpe; print outfile, s; +Input::remove(input); close(outfile); terminate(); }, config={ diff --git a/testing/btest/Baseline/scripts.base.frameworks.input.raw.rereadraw/out b/testing/btest/Baseline/scripts.base.frameworks.input.raw.rereadraw/out index b7f79e5754..7be01c4014 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.input.raw.rereadraw/out +++ b/testing/btest/Baseline/scripts.base.frameworks.input.raw.rereadraw/out @@ -6,6 +6,7 @@ print outfile, A::s; try = try + 1; if (16 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -23,6 +24,7 @@ print outfile, A::s; try = try + 1; if (16 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -40,6 +42,7 @@ print outfile, A::s; try = try + 1; if (16 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -57,6 +60,7 @@ print outfile, A::s; try = try + 1; if (16 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -74,6 +78,7 @@ print outfile, A::s; try = try + 1; if (16 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -91,6 +96,7 @@ print outfile, A::s; try = try + 1; if (16 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -108,6 +114,7 @@ print outfile, A::s; try = try + 1; if (16 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -125,6 +132,7 @@ print outfile, A::s; try = try + 1; if (16 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -142,6 +150,7 @@ print outfile, A::s; try = try + 1; if (16 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -159,6 +168,7 @@ print outfile, A::s; try = try + 1; if (16 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -176,6 +186,7 @@ print outfile, A::s; try = try + 1; if (16 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -193,6 +204,7 @@ print outfile, A::s; try = try + 1; if (16 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -210,6 +222,7 @@ print outfile, A::s; try = try + 1; if (16 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -227,6 +240,7 @@ print outfile, A::s; try = try + 1; if (16 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -244,6 +258,7 @@ print outfile, A::s; try = try + 1; if (16 == try) { +Input::remove(input); close(outfile); terminate(); } @@ -261,6 +276,7 @@ print outfile, A::s; try = try + 1; if (16 == try) { +Input::remove(input); close(outfile); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/basic.bro b/testing/btest/scripts/base/frameworks/input/basic.bro index ea6746c4db..d52af7d6e2 100644 --- a/testing/btest/scripts/base/frameworks/input/basic.bro +++ b/testing/btest/scripts/base/frameworks/input/basic.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out redef exit_only_after_terminate = T; @@ -50,13 +50,13 @@ event bro_init() outfile = open("../out"); # first read in the old stuff into the table... Input::add_table([$source="../input.log", $name="ssh", $idx=Idx, $val=Val, $destination=servers]); - Input::remove("ssh"); } event Input::end_of_data(name: string, source:string) { print outfile, servers; print outfile, to_count(servers[-42]$ns); # try to actually use a string. If null-termination is wrong this will fail. + Input::remove("ssh"); close(outfile); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/bignumber.bro b/testing/btest/scripts/base/frameworks/input/bignumber.bro index 19546d138c..15d711b1c4 100644 --- a/testing/btest/scripts/base/frameworks/input/bignumber.bro +++ b/testing/btest/scripts/base/frameworks/input/bignumber.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out redef exit_only_after_terminate = T; @@ -31,12 +31,12 @@ event bro_init() outfile = open("../out"); # first read in the old stuff into the table... Input::add_table([$source="../input.log", $name="ssh", $idx=Idx, $val=Val, $destination=servers]); - Input::remove("ssh"); } event Input::end_of_data(name: string, source:string) { print outfile, servers; + Input::remove("ssh"); close(outfile); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/binary.bro b/testing/btest/scripts/base/frameworks/input/binary.bro index d8345dbfd3..11701fbd8a 100644 --- a/testing/btest/scripts/base/frameworks/input/binary.bro +++ b/testing/btest/scripts/base/frameworks/input/binary.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out redef exit_only_after_terminate = T; @@ -39,6 +39,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, a: string, b try = try + 1; if ( try == 3 ) { + Input::remove("input"); close(outfile); terminate(); } @@ -49,5 +50,4 @@ event bro_init() try = 0; outfile = open("../out"); Input::add_event([$source="../input.log", $name="input", $fields=Val, $ev=line, $want_record=F]); - Input::remove("input"); } diff --git a/testing/btest/scripts/base/frameworks/input/empty-values-hashing.bro b/testing/btest/scripts/base/frameworks/input/empty-values-hashing.bro index 5226586ad1..44a15a29bc 100644 --- a/testing/btest/scripts/base/frameworks/input/empty-values-hashing.bro +++ b/testing/btest/scripts/base/frameworks/input/empty-values-hashing.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT # @TEST-EXEC: sleep 2 # @TEST-EXEC: cp input2.log input.log -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input1.log diff --git a/testing/btest/scripts/base/frameworks/input/emptyvals.bro b/testing/btest/scripts/base/frameworks/input/emptyvals.bro index cef0606646..57e79dd977 100644 --- a/testing/btest/scripts/base/frameworks/input/emptyvals.bro +++ b/testing/btest/scripts/base/frameworks/input/emptyvals.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input.log @@ -34,12 +34,12 @@ event bro_init() outfile = open("../out"); # first read in the old stuff into the table... Input::add_table([$source="../input.log", $name="ssh", $idx=Idx, $val=Val, $destination=servers]); - Input::remove("ssh"); } event Input::end_of_data(name: string, source:string) { print outfile, servers; + Input::remove("ssh"); close(outfile); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/event.bro b/testing/btest/scripts/base/frameworks/input/event.bro index ac956a4a19..6b6a391939 100644 --- a/testing/btest/scripts/base/frameworks/input/event.bro +++ b/testing/btest/scripts/base/frameworks/input/event.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input.log @@ -39,12 +39,12 @@ event bro_init() { outfile = open("../out"); Input::add_event([$source="../input.log", $name="input", $fields=Val, $ev=line, $want_record=F]); - Input::remove("input"); } event Input::end_of_data(name: string, source:string) { print outfile, "End-of-data"; + Input::remove("input"); close(outfile); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/invalidnumbers.bro b/testing/btest/scripts/base/frameworks/input/invalidnumbers.bro index 3321b41253..f2fefaa5d0 100644 --- a/testing/btest/scripts/base/frameworks/input/invalidnumbers.bro +++ b/testing/btest/scripts/base/frameworks/input/invalidnumbers.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out # @TEST-EXEC: sed 1d .stderr > .stderrwithoutfirstline # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderrwithoutfirstline @@ -35,11 +35,11 @@ event bro_init() outfile = open("../out"); # first read in the old stuff into the table... Input::add_table([$source="../input.log", $name="ssh", $idx=Idx, $val=Val, $destination=servers]); - Input::remove("ssh"); } event Input::end_of_data(name: string, source:string) { print outfile, servers; + Input::remove("ssh"); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/invalidtext.bro b/testing/btest/scripts/base/frameworks/input/invalidtext.bro index ffca41dbee..26b45832c4 100644 --- a/testing/btest/scripts/base/frameworks/input/invalidtext.bro +++ b/testing/btest/scripts/base/frameworks/input/invalidtext.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out # @TEST-EXEC: sed 1d .stderr > .stderrwithoutfirstline # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderrwithoutfirstline @@ -33,11 +33,11 @@ event bro_init() outfile = open("../out"); # first read in the old stuff into the table... Input::add_table([$source="../input.log", $name="ssh", $idx=Idx, $val=Val, $destination=servers]); - Input::remove("ssh"); } event Input::end_of_data(name: string, source:string) { print outfile, servers; + Input::remove("ssh"); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/missing-file.bro b/testing/btest/scripts/base/frameworks/input/missing-file.bro index 8fb12ba412..08adfe2150 100644 --- a/testing/btest/scripts/base/frameworks/input/missing-file.bro +++ b/testing/btest/scripts/base/frameworks/input/missing-file.bro @@ -23,5 +23,4 @@ event bro_init() try = 0; outfile = open("../out"); Input::add_event([$source="does-not-exist.dat", $name="input", $fields=Val, $ev=line, $want_record=F]); - Input::remove("input"); } diff --git a/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro b/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro index 989d6352a3..7d12fd6d3f 100644 --- a/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro +++ b/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input.log @@ -32,12 +32,12 @@ event bro_init() { outfile = open("../out"); Input::add_table([$source="../input.log", $name="input", $idx=Idx, $val=Val, $destination=servers, $want_record=F]); - Input::remove("input"); } event Input::end_of_data(name: string, source: string) { print outfile, servers; + Input::remove("input"); close(outfile); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/onecolumn-record.bro b/testing/btest/scripts/base/frameworks/input/onecolumn-record.bro index 54c8e9007e..3ee82983ff 100644 --- a/testing/btest/scripts/base/frameworks/input/onecolumn-record.bro +++ b/testing/btest/scripts/base/frameworks/input/onecolumn-record.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input.log @@ -32,12 +32,12 @@ event bro_init() { outfile = open("../out"); Input::add_table([$name="input", $source="../input.log", $idx=Idx, $val=Val, $destination=servers]); - Input::remove("input"); } event Input::end_of_data(name: string, source: string) { print outfile, servers; + Input::remove("input"); close(outfile); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/optional.bro b/testing/btest/scripts/base/frameworks/input/optional.bro index 1fb9bce68b..56c261999d 100644 --- a/testing/btest/scripts/base/frameworks/input/optional.bro +++ b/testing/btest/scripts/base/frameworks/input/optional.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input.log @@ -42,12 +42,12 @@ event bro_init() Input::add_table([$source="../input.log", $name="input", $idx=Idx, $val=Val, $destination=servers, $pred(typ: Input::Event, left: Idx, right: Val) = { right$notb = !right$b; return T; } ]); - Input::remove("input"); } event Input::end_of_data(name: string, source: string) { print outfile, servers; + Input::remove("input"); close(outfile); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/port.bro b/testing/btest/scripts/base/frameworks/input/port.bro index 31776c5939..48571c5ecd 100644 --- a/testing/btest/scripts/base/frameworks/input/port.bro +++ b/testing/btest/scripts/base/frameworks/input/port.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input.log @@ -37,7 +37,6 @@ event bro_init() print outfile, servers[1.2.3.5]; if ( 1.2.3.6 in servers ) print outfile, servers[1.2.3.6]; - Input::remove("input"); } event Input::end_of_data(name: string, source: string) @@ -45,6 +44,7 @@ event Input::end_of_data(name: string, source: string) print outfile, servers[1.2.3.4]; print outfile, servers[1.2.3.5]; print outfile, servers[1.2.3.6]; + Input::remove("input"); close(outfile); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/predicate-stream.bro b/testing/btest/scripts/base/frameworks/input/predicate-stream.bro index 8caea9ad7a..45cdf81059 100644 --- a/testing/btest/scripts/base/frameworks/input/predicate-stream.bro +++ b/testing/btest/scripts/base/frameworks/input/predicate-stream.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out # # only difference from predicate.bro is, that this one uses a stream source. @@ -59,6 +59,7 @@ event line(description: Input::TableDescription, tpe: Input::Event, left: Idx, r print outfile, "VALID"; if ( 7 in servers ) print outfile, "VALID"; + Input::remove("input"); close(outfile); terminate(); } @@ -71,6 +72,5 @@ event bro_init() Input::add_table([$source="../input.log", $mode=Input::STREAM, $name="input", $idx=Idx, $val=Val, $destination=servers, $want_record=F, $ev=line, $pred(typ: Input::Event, left: Idx, right: bool) = { return right; } ]); - Input::remove("input"); } diff --git a/testing/btest/scripts/base/frameworks/input/predicate.bro b/testing/btest/scripts/base/frameworks/input/predicate.bro index f9ff5c09ee..9946e72211 100644 --- a/testing/btest/scripts/base/frameworks/input/predicate.bro +++ b/testing/btest/scripts/base/frameworks/input/predicate.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input.log @@ -41,7 +41,6 @@ event bro_init() Input::add_table([$source="../input.log", $name="input", $idx=Idx, $val=Val, $destination=servers, $want_record=F, $pred(typ: Input::Event, left: Idx, right: bool) = { return right; } ]); - Input::remove("input"); } event Input::end_of_data(name: string, source: string) @@ -60,6 +59,7 @@ event Input::end_of_data(name: string, source: string) print outfile, "VALID"; if ( 7 in servers ) print outfile, "VALID"; + Input::remove("input"); close(outfile); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/predicatemodify.bro b/testing/btest/scripts/base/frameworks/input/predicatemodify.bro index 9d5eb3bd07..13ed38d6ba 100644 --- a/testing/btest/scripts/base/frameworks/input/predicatemodify.bro +++ b/testing/btest/scripts/base/frameworks/input/predicatemodify.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input.log @@ -45,12 +45,12 @@ event bro_init() return T; } ]); - Input::remove("input"); } event Input::end_of_data(name: string, source: string) { print outfile, servers; + Input::remove("input"); close(outfile); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.bro b/testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.bro index 174d145054..33455314cd 100644 --- a/testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.bro +++ b/testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.bro @@ -8,7 +8,7 @@ # @TEST-EXEC: cp input4.log input.log # @TEST-EXEC: sleep 2 # @TEST-EXEC: cp input5.log input.log -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out # diff --git a/testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.bro b/testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.bro index 247b301bfa..ae756431cd 100644 --- a/testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.bro +++ b/testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out # Ok, this one tests a fun case. @@ -42,12 +42,12 @@ event bro_init() Input::add_table([$source="../input.log", $name="input", $idx=Idx, $val=Val, $destination=servers, $pred(typ: Input::Event, left: Idx, right: Val) = { if ( right$confidence > 90 ) { return T; } return F; } ]); - Input::remove("input"); } event Input::end_of_data(name: string, source: string) { print outfile, servers; + Input::remove("input"); close(outfile); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/raw/basic.bro b/testing/btest/scripts/base/frameworks/input/raw/basic.bro index 0c4a438549..377e34aca7 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/basic.bro +++ b/testing/btest/scripts/base/frameworks/input/raw/basic.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input.log @@ -32,6 +32,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, s: string) try = try + 1; if ( try == 8 ) { + Input::remove("input"); close(outfile); terminate(); } @@ -42,5 +43,4 @@ event bro_init() try = 0; outfile = open("../out"); Input::add_event([$source="../input.log", $reader=Input::READER_RAW, $mode=Input::STREAM, $name="input", $fields=Val, $ev=line, $want_record=F]); - Input::remove("input"); } diff --git a/testing/btest/scripts/base/frameworks/input/raw/execute.bro b/testing/btest/scripts/base/frameworks/input/raw/execute.bro index bcec76444f..783b974c0f 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/execute.bro +++ b/testing/btest/scripts/base/frameworks/input/raw/execute.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: cat out.tmp | sed 's/^ *//g' >out # @TEST-EXEC: btest-diff out @@ -27,6 +27,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, s: string) print outfile, description; print outfile, tpe; print outfile, s; + Input::remove("input"); close(outfile); terminate(); } @@ -35,5 +36,4 @@ event bro_init() { outfile = open("../out.tmp"); Input::add_event([$source="wc -l ../input.log |", $reader=Input::READER_RAW, $name="input", $fields=Val, $ev=line, $want_record=F]); - Input::remove("input"); } diff --git a/testing/btest/scripts/base/frameworks/input/raw/executestream.bro b/testing/btest/scripts/base/frameworks/input/raw/executestream.bro index ead33018dc..9ce2688296 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/executestream.bro +++ b/testing/btest/scripts/base/frameworks/input/raw/executestream.bro @@ -4,7 +4,7 @@ # @TEST-EXEC: cat input2.log >> input.log # @TEST-EXEC: sleep 3 # @TEST-EXEC: cat input3.log >> input.log -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/raw/long.bro b/testing/btest/scripts/base/frameworks/input/raw/long.bro index ac07639f77..266021ae28 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/long.bro +++ b/testing/btest/scripts/base/frameworks/input/raw/long.bro @@ -1,6 +1,6 @@ # @TEST-EXEC: dd if=/dev/zero of=input.log bs=8193 count=1 # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out # # this test should be longer than one block-size. to test behavior of input-reader if it has to re-allocate stuff. @@ -23,6 +23,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, s: string) try = try + 1; if ( try == 1 ) { + Input::remove("input"); close(outfile); terminate(); } @@ -33,5 +34,4 @@ event bro_init() try = 0; outfile = open("../out"); Input::add_event([$source="../input.log", $reader=Input::READER_RAW, $mode=Input::STREAM, $name="input", $fields=Val, $ev=line, $want_record=F]); - Input::remove("input"); } diff --git a/testing/btest/scripts/base/frameworks/input/raw/rereadraw.bro b/testing/btest/scripts/base/frameworks/input/raw/rereadraw.bro index 16f13c21e1..f3dfb11ea5 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/rereadraw.bro +++ b/testing/btest/scripts/base/frameworks/input/raw/rereadraw.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input.log @@ -32,6 +32,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, s: string) try = try + 1; if ( try == 16 ) { + Input::remove("input"); close(outfile); terminate(); } @@ -43,5 +44,4 @@ event bro_init() outfile = open("../out"); Input::add_event([$source="../input.log", $reader=Input::READER_RAW, $mode=Input::REREAD, $name="input", $fields=Val, $ev=line, $want_record=F]); Input::force_update("input"); - Input::remove("input"); } diff --git a/testing/btest/scripts/base/frameworks/input/raw/stderr.bro b/testing/btest/scripts/base/frameworks/input/raw/stderr.bro index e84ed048cd..9db5a66721 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/stderr.bro +++ b/testing/btest/scripts/base/frameworks/input/raw/stderr.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/raw/streamraw.bro b/testing/btest/scripts/base/frameworks/input/raw/streamraw.bro index a7cb718975..84dd74e23c 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/streamraw.bro +++ b/testing/btest/scripts/base/frameworks/input/raw/streamraw.bro @@ -4,7 +4,7 @@ # @TEST-EXEC: cat input2.log >> input.log # @TEST-EXEC: sleep 3 # @TEST-EXEC: cat input3.log >> input.log -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/input/repeat.bro b/testing/btest/scripts/base/frameworks/input/repeat.bro index 08c7ab1592..d754e10257 100644 --- a/testing/btest/scripts/base/frameworks/input/repeat.bro +++ b/testing/btest/scripts/base/frameworks/input/repeat.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out @TEST-START-FILE input.log @@ -36,10 +36,7 @@ event bro_init() try = 0; outfile = open("../out"); for ( i in one_to_32 ) - { Input::add_table([$source="../input.log", $name=fmt("input%d", i), $idx=Idx, $val=Val, $destination=destination, $want_record=F]); - Input::remove(fmt("input%d", i)); - } } event Input::end_of_data(name: string, source: string) @@ -47,6 +44,7 @@ event Input::end_of_data(name: string, source: string) print outfile, name; print outfile, source; print outfile, destination; + Input::remove(name); try = try + 1; if ( try == 32 ) { diff --git a/testing/btest/scripts/base/frameworks/input/reread.bro b/testing/btest/scripts/base/frameworks/input/reread.bro index e7639d3e48..e55b4b4f0c 100644 --- a/testing/btest/scripts/base/frameworks/input/reread.bro +++ b/testing/btest/scripts/base/frameworks/input/reread.bro @@ -8,7 +8,7 @@ # @TEST-EXEC: cp input4.log input.log # @TEST-EXEC: sleep 2 # @TEST-EXEC: cp input5.log input.log -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input1.log diff --git a/testing/btest/scripts/base/frameworks/input/set.bro b/testing/btest/scripts/base/frameworks/input/set.bro index 95a7a86a28..d79e9ae17a 100644 --- a/testing/btest/scripts/base/frameworks/input/set.bro +++ b/testing/btest/scripts/base/frameworks/input/set.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out @TEST-START-FILE input.log @@ -32,12 +32,12 @@ event bro_init() outfile = open("../out"); # first read in the old stuff into the table... Input::add_table([$source="../input.log", $name="ssh", $idx=Idx, $destination=servers]); - Input::remove("ssh"); } event Input::end_of_data(name: string, source:string) { print outfile, servers; + Input::remove("ssh"); close(outfile); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/setseparator.bro b/testing/btest/scripts/base/frameworks/input/setseparator.bro index efc4b259f6..39a785236a 100644 --- a/testing/btest/scripts/base/frameworks/input/setseparator.bro +++ b/testing/btest/scripts/base/frameworks/input/setseparator.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out @TEST-START-FILE input.log @@ -32,12 +32,12 @@ event bro_init() outfile = open("../out"); # first read in the old stuff into the table... Input::add_table([$source="../input.log", $name="ssh", $idx=Idx, $val=Val, $destination=servers]); - Input::remove("ssh"); } event Input::end_of_data(name: string, source:string) { print outfile, servers; + Input::remove("ssh"); close(outfile); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/setspecialcases.bro b/testing/btest/scripts/base/frameworks/input/setspecialcases.bro index 27211a590e..40a708f772 100644 --- a/testing/btest/scripts/base/frameworks/input/setspecialcases.bro +++ b/testing/btest/scripts/base/frameworks/input/setspecialcases.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out @TEST-START-FILE input.log @@ -36,12 +36,12 @@ event bro_init() outfile = open("../out"); # first read in the old stuff into the table... Input::add_table([$source="../input.log", $name="ssh", $idx=Idx, $val=Val, $destination=servers]); - Input::remove("ssh"); } event Input::end_of_data(name: string, source:string) { print outfile, servers; + Input::remove("ssh"); close(outfile); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/basic.bro b/testing/btest/scripts/base/frameworks/input/sqlite/basic.bro index fb244685e7..03bc91beb7 100644 --- a/testing/btest/scripts/base/frameworks/input/sqlite/basic.bro +++ b/testing/btest/scripts/base/frameworks/input/sqlite/basic.bro @@ -3,7 +3,7 @@ # # @TEST-EXEC: cat conn.sql | sqlite3 conn.sqlite # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE conn.sql diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/error.bro b/testing/btest/scripts/base/frameworks/input/sqlite/error.bro index b7159aaca8..53ac1e0863 100644 --- a/testing/btest/scripts/base/frameworks/input/sqlite/error.bro +++ b/testing/btest/scripts/base/frameworks/input/sqlite/error.bro @@ -3,7 +3,7 @@ # @TEST-GROUP: sqlite # # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: sed '1d' .stderr | sort > cmpfile # @TEST-EXEC: btest-diff cmpfile @@ -93,6 +93,6 @@ event bro_init() Input::add_event([$source="../ssh", $name="ssh", $fields=SSH::Log, $ev=line, $reader=Input::READER_SQLITE, $want_record=T, $config=config_strings]); Input::add_event([$source="../ssh", $name="ssh2", $fields=SSH::Log, $ev=line, $reader=Input::READER_SQLITE, $want_record=T, $config=config_strings2]); - schedule +1secs { term_me() }; + schedule +3secs { term_me() }; } diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/port.bro b/testing/btest/scripts/base/frameworks/input/sqlite/port.bro index 2bc931304b..049ad2a386 100644 --- a/testing/btest/scripts/base/frameworks/input/sqlite/port.bro +++ b/testing/btest/scripts/base/frameworks/input/sqlite/port.bro @@ -3,7 +3,7 @@ # # @TEST-EXEC: cat port.sql | sqlite3 port.sqlite # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE port.sql diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/types.bro b/testing/btest/scripts/base/frameworks/input/sqlite/types.bro index e9d3534e21..4e60de3a96 100644 --- a/testing/btest/scripts/base/frameworks/input/sqlite/types.bro +++ b/testing/btest/scripts/base/frameworks/input/sqlite/types.bro @@ -3,7 +3,7 @@ # @TEST-GROUP: sqlite # # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE ssh.sql diff --git a/testing/btest/scripts/base/frameworks/input/stream.bro b/testing/btest/scripts/base/frameworks/input/stream.bro index 1d797f30d3..ed497859aa 100644 --- a/testing/btest/scripts/base/frameworks/input/stream.bro +++ b/testing/btest/scripts/base/frameworks/input/stream.bro @@ -4,7 +4,7 @@ # @TEST-EXEC: cat input2.log >> input.log # @TEST-EXEC: sleep 3 # @TEST-EXEC: cat input3.log >> input.log -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input1.log diff --git a/testing/btest/scripts/base/frameworks/input/subrecord-event.bro b/testing/btest/scripts/base/frameworks/input/subrecord-event.bro index 96774f9c29..ec1cc37efc 100644 --- a/testing/btest/scripts/base/frameworks/input/subrecord-event.bro +++ b/testing/btest/scripts/base/frameworks/input/subrecord-event.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input.log @@ -58,6 +58,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, value: Val) try = try + 1; if ( try == 1 ) { + Input::remove("ssh"); close(outfile); terminate(); } @@ -68,5 +69,4 @@ event bro_init() try = 0; outfile = open("../out"); Input::add_event([$source="../input.log", $name="ssh", $fields=Val, $ev=line, $want_record=T]); - Input::remove("ssh"); } diff --git a/testing/btest/scripts/base/frameworks/input/subrecord.bro b/testing/btest/scripts/base/frameworks/input/subrecord.bro index 6f6c286828..0f960c6d3c 100644 --- a/testing/btest/scripts/base/frameworks/input/subrecord.bro +++ b/testing/btest/scripts/base/frameworks/input/subrecord.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input.log @@ -56,12 +56,12 @@ event bro_init() outfile = open("../out"); # first read in the old stuff into the table... Input::add_table([$source="../input.log", $name="ssh", $idx=Idx, $val=Val, $destination=servers]); - Input::remove("ssh"); } event Input::end_of_data(name: string, source:string) { print outfile, servers; + Input::remove("ssh"); close(outfile); terminate(); } diff --git a/testing/btest/scripts/base/frameworks/input/tableevent.bro b/testing/btest/scripts/base/frameworks/input/tableevent.bro index c83b1361c1..162b5dfe34 100644 --- a/testing/btest/scripts/base/frameworks/input/tableevent.bro +++ b/testing/btest/scripts/base/frameworks/input/tableevent.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input.log @@ -41,6 +41,7 @@ event line(description: Input::TableDescription, tpe: Input::Event, left: Idx, r try = try + 1; if ( try == 7 ) { + Input::remove("input"); close(outfile); terminate(); } @@ -51,5 +52,4 @@ event bro_init() try = 0; outfile = open("../out"); Input::add_table([$source="../input.log", $name="input", $idx=Idx, $val=Val, $destination=destination, $want_record=F,$ev=line]); - Input::remove("input"); } diff --git a/testing/btest/scripts/base/frameworks/input/twotables.bro b/testing/btest/scripts/base/frameworks/input/twotables.bro index 79b33f7182..f0bedb2673 100644 --- a/testing/btest/scripts/base/frameworks/input/twotables.bro +++ b/testing/btest/scripts/base/frameworks/input/twotables.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT # @TEST-EXEC: sleep 5 # @TEST-EXEC: cp input3.log input.log -# @TEST-EXEC: btest-bg-wait -k 10 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff event.out # @TEST-EXEC: btest-diff pred1.out # @TEST-EXEC: btest-diff pred2.out diff --git a/testing/btest/scripts/base/frameworks/input/unsupported_types.bro b/testing/btest/scripts/base/frameworks/input/unsupported_types.bro index 937c963f27..beedc0a633 100644 --- a/testing/btest/scripts/base/frameworks/input/unsupported_types.bro +++ b/testing/btest/scripts/base/frameworks/input/unsupported_types.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff out @TEST-START-FILE input.log @@ -50,12 +50,12 @@ event bro_init() outfile = open("../out"); # first read in the old stuff into the table... Input::add_table([$source="../input.log", $name="ssh", $idx=Idx, $val=Val, $destination=servers]); - Input::remove("ssh"); } event Input::end_of_data(name: string, source:string) { print outfile, servers; + Input::remove("ssh"); close(outfile); terminate(); }