[Bro-Dev] [Bro-Commits] [git/bro] topic/robin/parallel-btest: Adding group "comm" to communication tests for parallelizing execution with new btest version. (32cb6d6)
G. Clark
gc355804 at ohio.edu
Thu Sep 8 13:33:41 PDT 2011
It seems like TEST-GROUP is very similar to TEST-PROFILE (in the btest
profile branch I'm working on). . . any way to merge these?
--Gilbert
On 9/8/11 9:13 AM, Robin Sommer wrote:
> Repository : ssh://git@bro-ids.icir.org/bro
>
> On branch : topic/robin/parallel-btest
> Link : http://tracker.bro-ids.org/bro/changeset/32cb6d6bc31c03d746bb0b72b012dd6730308c54/bro
>
>> ---------------------------------------------------------------
>
> commit 32cb6d6bc31c03d746bb0b72b012dd6730308c54
> Author: Robin Sommer<robin at icir.org>
> Date: Fri Sep 2 23:55:32 2011 -0700
>
> Adding group "comm" to communication tests for parallelizing execution
> with new btest version.
>
>
>> ---------------------------------------------------------------
>
> 32cb6d6bc31c03d746bb0b72b012dd6730308c54
> testing/btest/istate/broccoli.bro | 1 +
> testing/btest/istate/events-ssl.bro | 2 +-
> testing/btest/istate/events.bro | 2 +-
> testing/btest/istate/pybroccoli.py | 1 +
> testing/btest/istate/sync.bro | 2 +-
> .../policy/frameworks/cluster/start-it-up.bro | 1 +
> .../frameworks/control/configuration_update.bro | 1 +
> .../btest/policy/frameworks/control/id_value.bro | 1 +
> .../btest/policy/frameworks/control/shutdown.bro | 1 +
> .../policy/frameworks/logging/remote-types.bro | 2 +-
> testing/btest/policy/frameworks/logging/remote.bro | 2 +-
> .../policy/frameworks/metrics/basic-cluster.bro | 1 +
> 12 files changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/testing/btest/istate/broccoli.bro b/testing/btest/istate/broccoli.bro
> index 7f97f40..def9a78 100644
> --- a/testing/btest/istate/broccoli.bro
> +++ b/testing/btest/istate/broccoli.bro
> @@ -1,6 +1,7 @@
> # @TEST-REQUIRES: grep -vq '#define BROv6' $BUILD/config.h
> # @TEST-REQUIRES: test -e $BUILD/aux/broccoli/src/libbroccoli.so || test -e $BUILD/aux/broccoli/src/libbroccoli.dylib
> #
> +# @TEST-GROUP: comm
> # @TEST-EXEC: btest-bg-run bro bro %INPUT $DIST/aux/broccoli/test/broping-record.bro
> # @TEST-EXEC: btest-bg-run broccoli $BUILD/aux/broccoli/test/broping -r -c 3 127.0.0.1
> # @TEST-EXEC: btest-bg-wait -k 20
> diff --git a/testing/btest/istate/events-ssl.bro b/testing/btest/istate/events-ssl.bro
> index cfacae9..02fd957 100644
> --- a/testing/btest/istate/events-ssl.bro
> +++ b/testing/btest/istate/events-ssl.bro
> @@ -1,4 +1,4 @@
> -#
> +# @TEST-GROUP: comm
> # @TEST-EXEC: btest-bg-run sender bro -C -r $TRACES/web.trace --pseudo-realtime ../sender.bro
> # @TEST-EXEC: btest-bg-run receiver bro ../receiver.bro
> # @TEST-EXEC: btest-bg-wait -k 20
> diff --git a/testing/btest/istate/events.bro b/testing/btest/istate/events.bro
> index ecf2f2e..d2dfc63 100644
> --- a/testing/btest/istate/events.bro
> +++ b/testing/btest/istate/events.bro
> @@ -1,4 +1,4 @@
> -#
> +# @TEST-GROUP: comm
> # @TEST-EXEC: btest-bg-run sender bro -C -r $TRACES/web.trace --pseudo-realtime ../sender.bro
> # @TEST-EXEC: btest-bg-run receiver bro ../receiver.bro
> # @TEST-EXEC: btest-bg-wait -k 20
> diff --git a/testing/btest/istate/pybroccoli.py b/testing/btest/istate/pybroccoli.py
> index b7fb53a..ec4097a 100644
> --- a/testing/btest/istate/pybroccoli.py
> +++ b/testing/btest/istate/pybroccoli.py
> @@ -1,3 +1,4 @@
> +# @TEST-GROUP: comm
> # @TEST-REQUIRES: grep -vq '#define BROv6' $BUILD/config.h
> # @TEST-REQUIRES: test -e $BUILD/aux/broccoli/src/libbroccoli.so || test -e $BUILD/aux/broccoli/src/libbroccoli.dylib
> # @TEST-REQUIRES: test -e $BUILD/aux/broccoli/bindings/broccoli-python/_broccoli_intern.so
> diff --git a/testing/btest/istate/sync.bro b/testing/btest/istate/sync.bro
> index 567bbf2..c41542d 100644
> --- a/testing/btest/istate/sync.bro
> +++ b/testing/btest/istate/sync.bro
> @@ -1,4 +1,4 @@
> -#
> +# @TEST-GROUP: comm
> # @TEST-EXEC: btest-bg-run sender bro %INPUT ../sender.bro
> # @TEST-EXEC: btest-bg-run receiver bro %INPUT ../receiver.bro
> # @TEST-EXEC: btest-bg-wait 20
> diff --git a/testing/btest/policy/frameworks/cluster/start-it-up.bro b/testing/btest/policy/frameworks/cluster/start-it-up.bro
> index d1eb94d..c7d6c47 100644
> --- a/testing/btest/policy/frameworks/cluster/start-it-up.bro
> +++ b/testing/btest/policy/frameworks/cluster/start-it-up.bro
> @@ -1,3 +1,4 @@
> +# @TEST-GROUP: comm
> # @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 bro %INPUT
> # @TEST-EXEC: btest-bg-run proxy-1 BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-1 bro %INPUT
> # @TEST-EXEC: btest-bg-run proxy-2 BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-2 bro %INPUT
> diff --git a/testing/btest/policy/frameworks/control/configuration_update.bro b/testing/btest/policy/frameworks/control/configuration_update.bro
> index 23b4998..6d0f886 100644
> --- a/testing/btest/policy/frameworks/control/configuration_update.bro
> +++ b/testing/btest/policy/frameworks/control/configuration_update.bro
> @@ -1,3 +1,4 @@
> +# @TEST-GROUP: comm
> # @TEST-EXEC: btest-bg-run controllee BROPATH=$BROPATH:.. bro %INPUT frameworks/control/controllee Communication::listen_port_clear=65531/tcp
> # @TEST-EXEC: btest-bg-run controller BROPATH=$BROPATH:.. bro %INPUT test-redef frameworks/control/controller Control::host=127.0.0.1 Control::host_port=65531/tcp Control::cmd=configuration_update
> # @TEST-EXEC: btest-bg-run controller2 BROPATH=$BROPATH:.. bro %INPUT frameworks/control/controller Control::host=127.0.0.1 Control::host_port=65531/tcp Control::cmd=shutdown
> diff --git a/testing/btest/policy/frameworks/control/id_value.bro b/testing/btest/policy/frameworks/control/id_value.bro
> index 9f0cb76..c751928 100644
> --- a/testing/btest/policy/frameworks/control/id_value.bro
> +++ b/testing/btest/policy/frameworks/control/id_value.bro
> @@ -1,3 +1,4 @@
> +# @TEST-GROUP: comm
> # @TEST-EXEC: btest-bg-run controllee BROPATH=$BROPATH:.. bro %INPUT only-for-controllee frameworks/control/controllee Communication::listen_port_clear=65532/tcp
> # @TEST-EXEC: btest-bg-run controller BROPATH=$BROPATH:.. bro %INPUT frameworks/control/controller Control::host=127.0.0.1 Control::host_port=65532/tcp Control::cmd=id_value Control::arg=test_var
> # @TEST-EXEC: btest-bg-wait -k 1
> diff --git a/testing/btest/policy/frameworks/control/shutdown.bro b/testing/btest/policy/frameworks/control/shutdown.bro
> index 55af973..e7aabea 100644
> --- a/testing/btest/policy/frameworks/control/shutdown.bro
> +++ b/testing/btest/policy/frameworks/control/shutdown.bro
> @@ -1,3 +1,4 @@
> +# @TEST-GROUP: comm
> # @TEST-EXEC: btest-bg-run controllee BROPATH=$BROPATH:.. bro %INPUT frameworks/control/controllee Communication::listen_port_clear=65530/tcp
> # @TEST-EXEC: btest-bg-run controller BROPATH=$BROPATH:.. bro %INPUT frameworks/control/controller Control::host=127.0.0.1 Control::host_port=65530/tcp Control::cmd=shutdown
> # @TEST-EXEC: btest-bg-wait 1
> diff --git a/testing/btest/policy/frameworks/logging/remote-types.bro b/testing/btest/policy/frameworks/logging/remote-types.bro
> index 08960eb..164e7f3 100644
> --- a/testing/btest/policy/frameworks/logging/remote-types.bro
> +++ b/testing/btest/policy/frameworks/logging/remote-types.bro
> @@ -1,4 +1,4 @@
> -#
> +# @TEST-GROUP: comm
> # @TEST-EXEC: btest-bg-run sender bro --pseudo-realtime %INPUT ../sender.bro
> # @TEST-EXEC: btest-bg-run receiver bro --pseudo-realtime %INPUT ../receiver.bro
> # @TEST-EXEC: btest-bg-wait -k 1
> diff --git a/testing/btest/policy/frameworks/logging/remote.bro b/testing/btest/policy/frameworks/logging/remote.bro
> index 00d7d69..34cf714 100644
> --- a/testing/btest/policy/frameworks/logging/remote.bro
> +++ b/testing/btest/policy/frameworks/logging/remote.bro
> @@ -1,4 +1,4 @@
> -#
> +# @TEST-GROUP: comm
> # @TEST-EXEC: btest-bg-run sender bro --pseudo-realtime %INPUT ../sender.bro
> # @TEST-EXEC: sleep 1
> # @TEST-EXEC: btest-bg-run receiver bro --pseudo-realtime %INPUT ../receiver.bro
> diff --git a/testing/btest/policy/frameworks/metrics/basic-cluster.bro b/testing/btest/policy/frameworks/metrics/basic-cluster.bro
> index eda41c3..a282a96 100644
> --- a/testing/btest/policy/frameworks/metrics/basic-cluster.bro
> +++ b/testing/btest/policy/frameworks/metrics/basic-cluster.bro
> @@ -1,3 +1,4 @@
> +# @TEST-GROUP: comm
> # @TEST-EXEC: btest-bg-run manager-1 BROPATH=$BROPATH:.. CLUSTER_NODE=manager-1 bro %INPUT
> # @TEST-EXEC: btest-bg-run proxy-1 BROPATH=$BROPATH:.. CLUSTER_NODE=proxy-1 bro %INPUT
> # @TEST-EXEC: sleep 1
>
> _______________________________________________
> bro-commits mailing list
> bro-commits at bro-ids.org
> http://mailman.icsi.berkeley.edu/mailman/listinfo/bro-commits
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 6010 bytes
Desc: S/MIME Cryptographic Signature
Url : http://mailman.icsi.berkeley.edu/pipermail/bro-dev/attachments/20110908/04bcc941/attachment-0001.bin
More information about the bro-dev
mailing list