From 52ba1be9f9cd8f69fa3c9a5c58757d62ecfdfc84 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Mon, 13 Oct 2014 15:45:32 -0700 Subject: [PATCH] fix some additional sources of randomness in mesh tests --- src/mesh/test/dot11s/hwmp-proactive-regression.cc | 1 + src/mesh/test/dot11s/hwmp-reactive-regression.cc | 1 + src/mesh/test/dot11s/hwmp-simplest-regression.cc | 1 + src/mesh/test/dot11s/hwmp-target-flags-regression.cc | 1 + src/mesh/test/flame/flame-regression.cc | 1 + 5 files changed, 5 insertions(+) diff --git a/src/mesh/test/dot11s/hwmp-proactive-regression.cc b/src/mesh/test/dot11s/hwmp-proactive-regression.cc index 8a5caf6f1..18b5f8977 100644 --- a/src/mesh/test/dot11s/hwmp-proactive-regression.cc +++ b/src/mesh/test/dot11s/hwmp-proactive-regression.cc @@ -128,6 +128,7 @@ HwmpProactiveRegressionTest::CreateDevices () // 3. setup TCP/IP InternetStackHelper internetStack; internetStack.Install (*m_nodes); + streamsUsed += internetStack.AssignStreams (*m_nodes, streamsUsed); Ipv4AddressHelper address; address.SetBase ("10.1.1.0", "255.255.255.0"); m_interfaces = address.Assign (meshDevices); diff --git a/src/mesh/test/dot11s/hwmp-reactive-regression.cc b/src/mesh/test/dot11s/hwmp-reactive-regression.cc index 6e7e82cc7..04a256cef 100644 --- a/src/mesh/test/dot11s/hwmp-reactive-regression.cc +++ b/src/mesh/test/dot11s/hwmp-reactive-regression.cc @@ -125,6 +125,7 @@ HwmpReactiveRegressionTest::CreateDevices () // 3. setup TCP/IP InternetStackHelper internetStack; internetStack.Install (*m_nodes); + streamsUsed += internetStack.AssignStreams (*m_nodes, streamsUsed); Ipv4AddressHelper address; address.SetBase ("10.1.1.0", "255.255.255.0"); m_interfaces = address.Assign (meshDevices); diff --git a/src/mesh/test/dot11s/hwmp-simplest-regression.cc b/src/mesh/test/dot11s/hwmp-simplest-regression.cc index 5e1fd3f14..192880594 100644 --- a/src/mesh/test/dot11s/hwmp-simplest-regression.cc +++ b/src/mesh/test/dot11s/hwmp-simplest-regression.cc @@ -136,6 +136,7 @@ HwmpSimplestRegressionTest::CreateDevices () // 3. setup TCP/IP InternetStackHelper internetStack; internetStack.Install (*m_nodes); + streamsUsed += internetStack.AssignStreams (*m_nodes, streamsUsed); Ipv4AddressHelper address; address.SetBase ("10.1.1.0", "255.255.255.0"); m_interfaces = address.Assign (meshDevices); diff --git a/src/mesh/test/dot11s/hwmp-target-flags-regression.cc b/src/mesh/test/dot11s/hwmp-target-flags-regression.cc index 161e55ebd..ff1e29cb6 100644 --- a/src/mesh/test/dot11s/hwmp-target-flags-regression.cc +++ b/src/mesh/test/dot11s/hwmp-target-flags-regression.cc @@ -143,6 +143,7 @@ HwmpDoRfRegressionTest::CreateDevices () // 3. setup TCP/IP InternetStackHelper internetStack; internetStack.Install (*m_nodes); + streamsUsed += internetStack.AssignStreams (*m_nodes, streamsUsed); Ipv4AddressHelper address; address.SetBase ("10.1.1.0", "255.255.255.0"); m_interfaces = address.Assign (meshDevices); diff --git a/src/mesh/test/flame/flame-regression.cc b/src/mesh/test/flame/flame-regression.cc index b5f4bde42..1c0323e8e 100644 --- a/src/mesh/test/flame/flame-regression.cc +++ b/src/mesh/test/flame/flame-regression.cc @@ -114,6 +114,7 @@ FlameRegressionTest::CreateDevices () // 3. setup TCP/IP InternetStackHelper internetStack; internetStack.Install (*m_nodes); + streamsUsed += internetStack.AssignStreams (*m_nodes, streamsUsed); Ipv4AddressHelper address; address.SetBase ("10.1.1.0", "255.255.255.0"); m_interfaces = address.Assign (meshDevices);