From c5f4efd6cf2ba142ad272dbb5316fd215e7fa144 Mon Sep 17 00:00:00 2001 From: Josh Pelkey Date: Thu, 20 Jan 2011 14:39:10 -0500 Subject: [PATCH] Move response vectors to a sub-folder --- src/test/ns3tcp/ns3tcp-interop-test-suite.cc | 6 +++--- src/test/ns3tcp/ns3tcp-loss-test-suite.cc | 4 ++-- src/test/ns3tcp/ns3tcp-state-test-suite.cc | 6 +++--- .../ns3tcp-interop-response-vectors.pcap | Bin .../ns3tcp-loss-NewReno0-response-vectors.pcap | Bin .../ns3tcp-loss-NewReno1-response-vectors.pcap | Bin .../ns3tcp-loss-NewReno2-response-vectors.pcap | Bin .../ns3tcp-loss-NewReno3-response-vectors.pcap | Bin .../ns3tcp-loss-NewReno4-response-vectors.pcap | Bin .../ns3tcp-loss-Reno0-response-vectors.pcap | Bin .../ns3tcp-loss-Reno1-response-vectors.pcap | Bin .../ns3tcp-loss-Reno2-response-vectors.pcap | Bin .../ns3tcp-loss-Reno3-response-vectors.pcap | Bin .../ns3tcp-loss-Reno4-response-vectors.pcap | Bin .../ns3tcp-loss-Tahoe0-response-vectors.pcap | Bin .../ns3tcp-loss-Tahoe1-response-vectors.pcap | Bin .../ns3tcp-loss-Tahoe2-response-vectors.pcap | Bin .../ns3tcp-loss-Tahoe3-response-vectors.pcap | Bin .../ns3tcp-loss-Tahoe4-response-vectors.pcap | Bin .../ns3tcp-state0-response-vectors.pcap | Bin .../ns3tcp-state1-response-vectors.pcap | Bin .../ns3tcp-state2-response-vectors.pcap | Bin .../ns3tcp-state3-response-vectors.pcap | Bin .../ns3tcp-state4-response-vectors.pcap | Bin .../ns3tcp-state5-response-vectors.pcap | Bin .../ns3tcp-state6-response-vectors.pcap | Bin .../ns3tcp-state7-response-vectors.pcap | Bin .../ns3tcp-state8-response-vectors.pcap | Bin 28 files changed, 8 insertions(+), 8 deletions(-) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-interop-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-loss-NewReno0-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-loss-NewReno1-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-loss-NewReno2-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-loss-NewReno3-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-loss-NewReno4-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-loss-Reno0-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-loss-Reno1-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-loss-Reno2-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-loss-Reno3-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-loss-Reno4-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-loss-Tahoe0-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-loss-Tahoe1-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-loss-Tahoe2-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-loss-Tahoe3-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-loss-Tahoe4-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-state0-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-state1-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-state2-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-state3-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-state4-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-state5-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-state6-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-state7-response-vectors.pcap (100%) rename src/test/ns3tcp/{ => response-vectors}/ns3tcp-state8-response-vectors.pcap (100%) diff --git a/src/test/ns3tcp/ns3tcp-interop-test-suite.cc b/src/test/ns3tcp/ns3tcp-interop-test-suite.cc index 1fba99f94..3d1c55232 100644 --- a/src/test/ns3tcp/ns3tcp-interop-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-interop-test-suite.cc @@ -107,10 +107,10 @@ void Ns3TcpInteroperabilityTestCase::DoSetup (void) { // - // We expect there to be a file called tcp-interop-response-vectors.pcap" in - // the source directory of this file. + // We expect there to be a file called tcp-interop-response-vectors.pcap in + // response-vectors/ of this directory // - m_pcapFilename = NS_TEST_SOURCEDIR + "ns3tcp-interop-response-vectors.pcap"; + m_pcapFilename = NS_TEST_SOURCEDIR + "/response-vectors/ns3tcp-interop-response-vectors.pcap"; if (m_writeVectors) { diff --git a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc b/src/test/ns3tcp/ns3tcp-loss-test-suite.cc index 93c183a44..db4fa4cff 100644 --- a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-loss-test-suite.cc @@ -109,10 +109,10 @@ Ns3TcpLossTestCase::DoSetup (void) { // // We expect there to be a file called ns3tcp-state-response-vectors.pcap in - // the source directory of this file. + // response-vectors/ of this directory // std::ostringstream oss; - oss << "ns3tcp-loss-" << m_tcpModel << m_testCase << "-response-vectors.pcap"; + oss << "/response-vectors/ns3tcp-loss-" << m_tcpModel << m_testCase << "-response-vectors.pcap"; m_pcapFilename = NS_TEST_SOURCEDIR + oss.str (); if (m_writeVectors) diff --git a/src/test/ns3tcp/ns3tcp-state-test-suite.cc b/src/test/ns3tcp/ns3tcp-state-test-suite.cc index 7118a9067..8fc6a1cfa 100644 --- a/src/test/ns3tcp/ns3tcp-state-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-state-test-suite.cc @@ -105,11 +105,11 @@ void Ns3TcpStateTestCase::DoSetup (void) { // - // We expect there to be a file called ns3tcp-state-response-vectors.pcap" in - // the source directory of this file. + // We expect there to be a file called ns3tcp-state-response-vectors.pcap in + // response-vectors/ of this directory // std::ostringstream oss; - oss << "ns3tcp-state" << m_testCase << "-response-vectors.pcap"; + oss << "/response-vectors/ns3tcp-state" << m_testCase << "-response-vectors.pcap"; m_pcapFilename = NS_TEST_SOURCEDIR + oss.str (); if (m_writeVectors) diff --git a/src/test/ns3tcp/ns3tcp-interop-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-interop-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-interop-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-interop-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-loss-NewReno0-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-NewReno0-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-loss-NewReno0-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-loss-NewReno0-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-loss-NewReno1-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-NewReno1-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-loss-NewReno1-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-loss-NewReno1-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-loss-NewReno2-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-NewReno2-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-loss-NewReno2-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-loss-NewReno2-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-loss-NewReno3-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-NewReno3-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-loss-NewReno3-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-loss-NewReno3-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-loss-NewReno4-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-NewReno4-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-loss-NewReno4-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-loss-NewReno4-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-loss-Reno0-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-Reno0-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-loss-Reno0-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-loss-Reno0-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-loss-Reno1-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-Reno1-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-loss-Reno1-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-loss-Reno1-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-loss-Reno2-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-Reno2-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-loss-Reno2-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-loss-Reno2-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-loss-Reno3-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-Reno3-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-loss-Reno3-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-loss-Reno3-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-loss-Reno4-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-Reno4-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-loss-Reno4-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-loss-Reno4-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-loss-Tahoe0-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-Tahoe0-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-loss-Tahoe0-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-loss-Tahoe0-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-loss-Tahoe1-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-Tahoe1-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-loss-Tahoe1-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-loss-Tahoe1-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-loss-Tahoe2-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-Tahoe2-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-loss-Tahoe2-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-loss-Tahoe2-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-loss-Tahoe3-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-Tahoe3-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-loss-Tahoe3-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-loss-Tahoe3-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-loss-Tahoe4-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-loss-Tahoe4-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-loss-Tahoe4-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-loss-Tahoe4-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-state0-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-state0-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-state0-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-state0-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-state1-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-state1-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-state1-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-state1-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-state2-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-state2-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-state2-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-state2-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-state3-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-state3-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-state3-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-state3-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-state4-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-state4-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-state4-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-state4-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-state5-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-state5-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-state5-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-state5-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-state6-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-state6-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-state6-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-state6-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-state7-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-state7-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-state7-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-state7-response-vectors.pcap diff --git a/src/test/ns3tcp/ns3tcp-state8-response-vectors.pcap b/src/test/ns3tcp/response-vectors/ns3tcp-state8-response-vectors.pcap similarity index 100% rename from src/test/ns3tcp/ns3tcp-state8-response-vectors.pcap rename to src/test/ns3tcp/response-vectors/ns3tcp-state8-response-vectors.pcap