diff --git a/CHANGES b/CHANGES index b5fb5fe274..ff6e283db7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,9 @@ +2.2-beta-180 | 2013-11-01 05:03:37 -0700 + + * Canonfying an intel test to not depend on output order. (Robin + Sommer) + 2.2-beta-177 | 2013-10-30 04:54:54 -0700 * Fix thread processing/termination conditions. (Jon Siwek) diff --git a/VERSION b/VERSION index 9a2bcb901d..a0f735c7cb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2-beta-177 +2.2-beta-180 diff --git a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.bro b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.bro index 4d977d475d..5bedf752d2 100644 --- a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.bro +++ b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.bro @@ -4,10 +4,10 @@ # @TEST-EXEC: btest-bg-run worker-1 BROPATH=$BROPATH:.. CLUSTER_NODE=worker-1 bro %INPUT # @TEST-EXEC: btest-bg-run worker-2 BROPATH=$BROPATH:.. CLUSTER_NODE=worker-2 bro %INPUT # @TEST-EXEC: btest-bg-wait -k 10 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-2/.stdout # @TEST-EXEC: btest-diff manager-1/intel.log -# @TEST-EXEC: btest-diff worker-1/.stdout -# @TEST-EXEC: btest-diff worker-2/.stdout @TEST-START-FILE cluster-layout.bro redef Cluster::nodes = { @@ -77,4 +77,4 @@ event remote_connection_closed(p: event_peer) # Cascading termination #print fmt("disconnected from: %s", p); terminate_communication(); - } \ No newline at end of file + }