fixed Bug 1439 - exclude headers for tests from installation

This commit is contained in:
Nicola Baldo
2012-05-29 13:56:26 +02:00
parent 06a99fb415
commit d53c6eee05
43 changed files with 194 additions and 100 deletions

View File

@@ -32,7 +32,7 @@
NS_LOG_COMPONENT_DEFINE ("BuildingPositionAllocatorTest");
using namespace ns3;
namespace ns3 {
@@ -237,3 +237,6 @@ BuildingPositionAllocatorTestSuite::BuildingPositionAllocatorTestSuite ()
}
static BuildingPositionAllocatorTestSuite buildingsPositionAllocatorTestSuiteInstance;
} // namespace ns3

View File

@@ -30,7 +30,7 @@
NS_LOG_COMPONENT_DEFINE ("BuildingsHelperTest");
using namespace ns3;
namespace ns3 {
struct PositionInBuilding
@@ -323,3 +323,6 @@ BuildingsHelperTestSuite::BuildingsHelperTestSuite ()
}
static BuildingsHelperTestSuite buildingsHelperAntennaTestSuiteInstance;
} // namespace ns3

View File

@@ -24,12 +24,13 @@
#include <ns3/log.h>
#include <ns3/buildings-helper.h>
#include <ns3/buildings-pathloss-test.h>
#include "ns3/string.h"
#include "ns3/double.h"
#include <ns3/string.h>
#include <ns3/double.h>
#include <ns3/building.h>
#include <ns3/enum.h>
#include "buildings-pathloss-test.h"
NS_LOG_COMPONENT_DEFINE ("BuildingsPathlossTest");

View File

@@ -19,16 +19,17 @@
* Nicola Baldo <nbaldo@cttc.es>
*/
#include "ns3/simulator.h"
#include "ns3/log.h"
#include "ns3/buildings-shadowing-test.h"
#include <ns3/simulator.h>
#include <ns3/log.h>
#include <ns3/hybrid-buildings-propagation-loss-model.h>
#include "ns3/string.h"
#include "ns3/double.h"
#include <ns3/string.h>
#include <ns3/double.h>
#include <ns3/building.h>
#include <ns3/enum.h>
#include <ns3/buildings-helper.h>
#include "buildings-shadowing-test.h"
NS_LOG_COMPONENT_DEFINE ("BuildingsShadowingTest");

View File

@@ -39,8 +39,6 @@ def build(bld):
'helper/building-allocator.h',
'helper/building-position-allocator.h',
'helper/buildings-helper.h',
'test/buildings-pathloss-test.h',
'test/buildings-shadowing-test.h',
]
if (bld.env['ENABLE_EXAMPLES']):

View File

@@ -22,13 +22,13 @@
#include "ns3/log.h"
#include "ns3/object.h"
#include "ns3/packet.h"
#include "ns3/epc-gtpu-header.h"
#include "ns3/epc-test-gtpu.h"
#include "epc-test-gtpu.h"
NS_LOG_COMPONENT_DEFINE ("EpcGtpuTest");
using namespace ns3;
namespace ns3 {
/**
@@ -84,3 +84,6 @@ EpsGtpuHeaderTestCase::DoRun (void)
NS_TEST_ASSERT_MSG_EQ (h1, h2, "Wrong value!");
}
} // namespace ns3

View File

@@ -26,7 +26,7 @@
#include "ns3/test.h"
using namespace ns3;
namespace ns3 {
@@ -50,4 +50,7 @@ private:
};
} // namespace ns3
#endif /* EPC_TEST_GTPU_H */

View File

@@ -18,13 +18,17 @@
* Author: Manuel Requena <manuel.requena@cttc.es> (Based on lte-helper.cc)
*/
#include "ns3/lte-simple-helper.h"
#include "ns3/log.h"
#include "ns3/callback.h"
#include "ns3/config.h"
#include "ns3/simple-channel.h"
#include "ns3/error-model.h"
#include "lte-simple-helper.h"
#include "lte-simple-net-device.h"
#include "lte-test-entities.h"
NS_LOG_COMPONENT_DEFINE ("LteSimpleHelper");

View File

@@ -25,9 +25,7 @@
#include "ns3/simple-channel.h"
#include "ns3/node-container.h"
#include "ns3/radio-bearer-stats-calculator.h"
#include "ns3/lte-simple-net-device.h"
#include "ns3/lte-test-entities.h"
#include "ns3/lte-pdcp.h"
#include "ns3/lte-rlc.h"
#include "ns3/lte-rlc-um.h"
@@ -35,6 +33,8 @@
namespace ns3 {
class LteTestRrc;
class LteTestMac;
/**
* Creation and configuration of LTE entities

View File

@@ -21,7 +21,7 @@
#include "ns3/simulator.h"
#include "ns3/pointer.h"
#include "ns3/log.h"
#include "ns3/lte-simple-net-device.h"
#include "lte-simple-net-device.h"
NS_LOG_COMPONENT_DEFINE ("LteSimpleNetDevice");

View File

@@ -25,15 +25,16 @@
#include "ns3/spectrum-test.h"
#include "ns3/lte-phy-tag.h"
#include "ns3/lte-test-ue-phy.h"
#include "ns3/lte-sinr-chunk-processor.h"
#include "ns3/lte-spectrum-signal-parameters.h"
#include "ns3/lte-test-downlink-sinr.h"
#include "lte-test-downlink-sinr.h"
#include "lte-test-ue-phy.h"
NS_LOG_COMPONENT_DEFINE ("LteDownlinkSinrTest");
using namespace ns3;
namespace ns3 {
/**
@@ -266,3 +267,6 @@ LteDownlinkSinrTestCase::DoRun (void)
dlPhy->Dispose ();
Simulator::Destroy ();
}
} // namespace ns3

View File

@@ -26,7 +26,7 @@
#include "ns3/test.h"
using namespace ns3;
namespace ns3 {
/**
@@ -54,4 +54,7 @@ private:
};
} // namespace ns3
#endif /* LTE_TEST_DOWNLINK_SINR_H */

View File

@@ -25,11 +25,11 @@
#include "ns3/lte-rlc-am-header.h"
#include "ns3/lte-pdcp-header.h"
#include "ns3/lte-test-entities.h"
#include "lte-test-entities.h"
NS_LOG_COMPONENT_DEFINE ("LteTestEntities");
using namespace ns3;
namespace ns3 {
/////////////////////////////////////////////////////////////////////
@@ -600,3 +600,6 @@ LteTestMac::Receive (Ptr<NetDevice> nd, Ptr<const Packet> p, uint16_t protocol,
m_macSapUser->ReceivePdu (packet);
return true;
}
} // namespace ns3

View File

@@ -31,8 +31,8 @@
#include "ns3/net-device.h"
using namespace ns3;
namespace ns3 {
/**
* This class implements a testing RRC entity
@@ -261,4 +261,6 @@ class LteTestMac : public Object
};
} // namespace ns3
#endif /* LTE_TEST_MAC_H */

View File

@@ -52,7 +52,7 @@
NS_LOG_COMPONENT_DEFINE ("LteFadingTest");
using namespace ns3;
namespace ns3 {
/**
@@ -295,3 +295,6 @@ LteFadingTestCase::GetFadingSample ()
(*outPsd1)[1] = (10 * log10 (180000*(*outPsd1)[1])) - (10 * log10 (180000*(*inPsd1)[1]));
m_fadingSamples.push_back ((*outPsd1));
}
} // namespace ns3

View File

@@ -31,7 +31,7 @@
#include <ns3/trace-fading-loss-model.h>
using namespace ns3;
namespace ns3 {
/**
@@ -83,4 +83,7 @@ class LteFadingSystemTestCase : public TestCase
uint16_t m_mcsIndex;
};
} // namespace ns3
#endif /*LTE_TEST_FADING_H*/

View File

@@ -34,13 +34,13 @@
#include "ns3/lte-ue-phy.h"
#include "ns3/lte-ue-net-device.h"
#include "ns3/lte-test-interference.h"
#include "lte-test-interference.h"
#include "lte-test-sinr-chunk-processor.h"
NS_LOG_COMPONENT_DEFINE ("LteInterferenceTest");
using namespace ns3;
namespace ns3 {
void
@@ -252,3 +252,6 @@ LteInterferenceTestCase::UlScheduling (uint32_t frameNo, uint32_t subframeNo, ui
NS_TEST_ASSERT_MSG_EQ ((uint16_t)mcs, m_ulMcs, "Wrong UL MCS");
}
}
} // namespace ns3

View File

@@ -25,7 +25,7 @@
#include "ns3/test.h"
using namespace ns3;
namespace ns3 {
/**
@@ -65,4 +65,7 @@ private:
};
} // namespace ns3
#endif /* LTE_TEST_INTERFERENCE_H */

View File

@@ -30,13 +30,13 @@
#include "ns3/lte-ue-phy.h"
#include "ns3/lte-ue-net-device.h"
#include "ns3/lte-test-link-adaptation.h"
#include "lte-test-link-adaptation.h"
#include "lte-test-sinr-chunk-processor.h"
NS_LOG_COMPONENT_DEFINE ("LteLinkAdaptationTest");
using namespace ns3;
namespace ns3 {
/**
@@ -239,3 +239,6 @@ LteLinkAdaptationTestCase::DlScheduling (uint32_t frameNo, uint32_t subframeNo,
NS_TEST_ASSERT_MSG_EQ ((uint16_t)mcsTb1, m_mcsIndex, "Wrong MCS index");
}
}
} // namespace ns3

View File

@@ -24,7 +24,7 @@
#include "ns3/test.h"
using namespace ns3;
namespace ns3 {
/**
@@ -56,4 +56,7 @@ private:
};
} // namespace ns3
#endif /* LTE_TEST_LINK_ADAPTATION_H */

View File

@@ -34,7 +34,6 @@
#include "ns3/radio-bearer-stats-calculator.h"
#include <ns3/buildings-mobility-model.h>
#include <ns3/buildings-propagation-loss-model.h>
#include "ns3/lte-test-mimo.h"
#include <ns3/eps-bearer.h>
#include <ns3/node-container.h>
#include <ns3/mobility-helper.h>
@@ -53,10 +52,12 @@
#include <ns3/pointer.h>
#include <ns3/enum.h>
#include "lte-test-mimo.h"
NS_LOG_COMPONENT_DEFINE ("LenaTestMimo");
using namespace ns3;
namespace ns3 {
LenaTestMimoSuite::LenaTestMimoSuite ()
@@ -284,3 +285,6 @@ LenaMimoTestCase::GetRlcBufferSample (Ptr<RadioBearerStatsCalculator> rlcStats,
}
} // namespace ns3

View File

@@ -25,7 +25,7 @@
#include "ns3/test.h"
using namespace ns3;
namespace ns3 {
/**
@@ -64,4 +64,7 @@ public:
} // namespace ns3
#endif /* LENA_TEST_MIMO_H */

View File

@@ -25,10 +25,9 @@
#include "ns3/spectrum-test.h"
#include "ns3/lte-phy-tag.h"
#include "ns3/lte-test-ue-phy.h"
#include "ns3/lte-sinr-chunk-processor.h"
#include "ns3/lte-test-pathloss-model.h"
#include <ns3/hybrid-buildings-propagation-loss-model.h>
#include <ns3/node-container.h>
#include <ns3/mobility-helper.h>
@@ -45,11 +44,14 @@
#include <ns3/lte-helper.h>
#include <ns3/lte-enb-phy.h>
#include <ns3/lte-ue-phy.h>
#include <ns3/lte-test-sinr-chunk-processor.h>
#include "lte-test-sinr-chunk-processor.h"
#include "lte-test-ue-phy.h"
#include "lte-test-pathloss-model.h"
NS_LOG_COMPONENT_DEFINE ("LtePathlossModelTest");
using namespace ns3;
namespace ns3 {
/**
@@ -310,3 +312,6 @@ LtePathlossModelSystemTestCase::DlScheduling (uint32_t frameNo, uint32_t subfram
}
}
} // namespace ns3

View File

@@ -29,7 +29,7 @@
#include <ns3/buildings-propagation-loss-model.h>
using namespace ns3;
namespace ns3 {
/**
@@ -61,5 +61,8 @@ class LtePathlossModelSystemTestCase : public TestCase
};
} // namespace ns3
#endif /* LTE_TEST_PATHLOSS_MODEL_H */

View File

@@ -33,7 +33,6 @@
#include <ns3/ptr.h>
#include "ns3/radio-bearer-stats-calculator.h"
#include <ns3/constant-position-mobility-model.h>
#include "ns3/lte-test-pf-ff-mac-scheduler.h"
#include <ns3/eps-bearer.h>
#include <ns3/node-container.h>
#include <ns3/mobility-helper.h>
@@ -49,10 +48,11 @@
#include <ns3/boolean.h>
#include <ns3/enum.h>
#include "lte-test-pf-ff-mac-scheduler.h"
NS_LOG_COMPONENT_DEFINE ("LenaTestPfFfMacCheduler");
using namespace ns3;
namespace ns3 {
LenaTestPfFfMacSchedulerSuite::LenaTestPfFfMacSchedulerSuite ()
: TestSuite ("lte-pf-ff-mac-scheduler", SYSTEM)
@@ -535,5 +535,8 @@ LenaPfFfMacSchedulerTestCase2::DoRun (void)
}
} // namespace ns3

View File

@@ -26,7 +26,7 @@
#include "ns3/test.h"
using namespace ns3;
namespace ns3 {
/**
@@ -82,4 +82,7 @@ public:
} // namespace ns3
#endif /* LENA_TEST_PF_FF_MAC_SCHEDULER_H */

View File

@@ -30,7 +30,6 @@
#include <ns3/radio-bearer-stats-calculator.h>
#include <ns3/buildings-mobility-model.h>
#include <ns3/hybrid-buildings-propagation-loss-model.h>
#include "ns3/lte-test-phy-error-model.h"
#include <ns3/eps-bearer.h>
#include <ns3/node-container.h>
#include <ns3/mobility-helper.h>
@@ -48,10 +47,11 @@
#include <ns3/enum.h>
#include <ns3/unused.h>
#include "lte-test-phy-error-model.h"
NS_LOG_COMPONENT_DEFINE ("LenaTestPhyErrorModel");
using namespace ns3;
namespace ns3 {
LenaTestPhyErrorModelrSuite::LenaTestPhyErrorModelrSuite ()
@@ -257,3 +257,6 @@ LenaPhyErrorModelTestCase::DoRun (void)
Simulator::Destroy ();
}
} // namespace ns3

View File

@@ -25,7 +25,7 @@
#include "ns3/test.h"
using namespace ns3;
namespace ns3 {
/**
@@ -63,4 +63,7 @@ public:
} // namespace ns3
#endif /* LENA_TEST_PHY_ERROR_MODEL_H */

View File

@@ -25,23 +25,20 @@
#include "ns3/packet.h"
#include "ns3/node-container.h"
#include "ns3/net-device-container.h"
#include "ns3/lte-simple-helper.h"
#include "ns3/error-model.h"
#include "ns3/radio-bearer-stats-calculator.h"
#include "ns3/lte-rlc-header.h"
#include "ns3/lte-rlc-um.h"
#include "ns3/lte-test-entities.h"
#include "ns3/lte-test-rlc-am-e2e.h"
#include "ns3/config-store.h"
#include "lte-test-rlc-am-e2e.h"
#include "lte-simple-helper.h"
#include "lte-test-entities.h"
NS_LOG_COMPONENT_DEFINE ("LteRlcAmE2eTest");
using namespace ns3;
namespace ns3 {
/**
@@ -214,3 +211,6 @@ LteRlcAmE2eTestCase::DoRun (void)
Simulator::Destroy ();
}
} // namespace ns3

View File

@@ -24,7 +24,7 @@
#include "ns3/test.h"
using namespace ns3;
namespace ns3 {
/**
@@ -58,4 +58,7 @@ class LteRlcAmE2eTestCase : public TestCase
};
} // namespace ns3
#endif // LTE_TEST_RLC_AM_E2E_H

View File

@@ -24,11 +24,12 @@
#include "ns3/lte-rlc-header.h"
#include "ns3/lte-rlc-am.h"
#include "ns3/lte-test-rlc-am-transmitter.h"
#include "lte-test-rlc-am-transmitter.h"
#include "lte-test-entities.h"
NS_LOG_COMPONENT_DEFINE ("LteRlcAmTransmitterTest");
using namespace ns3;
namespace ns3 {
/**
@@ -296,3 +297,6 @@ LteRlcAmTransmitterReportBufferStatusTestCase::DoRun (void)
Simulator::Run ();
Simulator::Destroy ();
}
} // namespace ns3

View File

@@ -23,10 +23,12 @@
#include "ns3/test.h"
#include "ns3/lte-test-entities.h"
using namespace ns3;
namespace ns3 {
class LteTestRrc;
class LteTestMac;
class LteTestPdcp;
/**
* TestSuite 4.1.1 RLC AM: Only transmitter
@@ -118,4 +120,6 @@ class LteRlcAmTransmitterReportBufferStatusTestCase : public LteRlcAmTransmitter
};
} // namespace ns3
#endif // LTE_TEST_RLC_AM_TRANSMITTER_H

View File

@@ -25,20 +25,19 @@
#include "ns3/packet.h"
#include "ns3/node-container.h"
#include "ns3/net-device-container.h"
#include "ns3/lte-simple-helper.h"
#include "ns3/error-model.h"
#include "ns3/radio-bearer-stats-calculator.h"
#include "ns3/lte-rlc-header.h"
#include "ns3/lte-rlc-um.h"
#include "ns3/lte-test-entities.h"
#include "ns3/lte-test-rlc-um-e2e.h"
#include "lte-simple-helper.h"
#include "lte-test-entities.h"
#include "lte-test-rlc-um-e2e.h"
NS_LOG_COMPONENT_DEFINE ("LteRlcUmE2eTest");
using namespace ns3;
namespace ns3 {
/**
@@ -224,3 +223,6 @@ LteRlcUmE2eTestCase::DoRun (void)
Simulator::Destroy ();
}
} // namespace ns3

View File

@@ -24,7 +24,7 @@
#include "ns3/test.h"
using namespace ns3;
namespace ns3 {
/**
@@ -58,4 +58,7 @@ class LteRlcUmE2eTestCase : public TestCase
};
} // namespace ns3
#endif // LTE_TEST_RLC_UM_E2E_H

View File

@@ -24,11 +24,12 @@
#include "ns3/lte-rlc-header.h"
#include "ns3/lte-rlc-um.h"
#include "ns3/lte-test-rlc-um-transmitter.h"
#include "lte-test-rlc-um-transmitter.h"
#include "lte-test-entities.h"
NS_LOG_COMPONENT_DEFINE ("LteRlcUmTransmitterTest");
using namespace ns3;
namespace ns3 {
/**
@@ -298,3 +299,6 @@ LteRlcUmTransmitterReportBufferStatusTestCase::DoRun (void)
Simulator::Destroy ();
}
} // namespace ns3

View File

@@ -23,10 +23,12 @@
#include "ns3/test.h"
#include "ns3/lte-test-entities.h"
using namespace ns3;
namespace ns3 {
class LteTestRrc;
class LteTestMac;
class LteTestPdcp;
/**
* TestSuite 4.1.1 RLC UM: Only transmitter
@@ -118,4 +120,6 @@ class LteRlcUmTransmitterReportBufferStatusTestCase : public LteRlcUmTransmitter
};
} // namespace ns3
#endif /* LTE_TEST_RLC_UM_TRANSMITTER_H */

View File

@@ -29,7 +29,6 @@
#include <iostream>
#include "ns3/radio-bearer-stats-calculator.h"
#include <ns3/constant-position-mobility-model.h>
#include "ns3/lte-test-rr-ff-mac-scheduler.h"
#include <ns3/eps-bearer.h>
#include <ns3/node-container.h>
#include <ns3/mobility-helper.h>
@@ -45,10 +44,11 @@
#include <ns3/boolean.h>
#include <ns3/enum.h>
#include "lte-test-rr-ff-mac-scheduler.h"
NS_LOG_COMPONENT_DEFINE ("LenaTestRrFfMacCheduler");
using namespace ns3;
namespace ns3 {
LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite ()
@@ -324,3 +324,6 @@ LenaRrFfMacSchedulerTestCase::DoRun (void)
Simulator::Destroy ();
}
} // namespace ns3

View File

@@ -25,7 +25,7 @@
#include "ns3/test.h"
using namespace ns3;
namespace ns3 {
/**
@@ -64,5 +64,8 @@ public:
} // namespace ns3
#endif /* LENA_TEST_RR_FF_MAC_SCHEDULER_H */

View File

@@ -19,7 +19,7 @@
*/
#include "ns3/log.h"
#include "ns3/lte-test-ue-phy.h"
#include "lte-test-ue-phy.h"
NS_LOG_COMPONENT_DEFINE ("LteTestUePhy");

View File

@@ -25,15 +25,15 @@
#include "ns3/spectrum-test.h"
#include "ns3/lte-phy-tag.h"
#include "ns3/lte-test-ue-phy.h"
#include "ns3/lte-sinr-chunk-processor.h"
#include "ns3/lte-spectrum-signal-parameters.h"
#include "ns3/lte-test-uplink-sinr.h"
#include "lte-test-ue-phy.h"
#include "lte-test-uplink-sinr.h"
NS_LOG_COMPONENT_DEFINE ("LteUplinkSinrTest");
using namespace ns3;
namespace ns3 {
/**
@@ -307,3 +307,6 @@ LteUplinkSinrTestCase::DoRun (void)
Simulator::Destroy ();
}
} // namespace ns3

View File

@@ -26,7 +26,7 @@
#include "ns3/test.h"
using namespace ns3;
namespace ns3 {
/**
@@ -56,3 +56,6 @@ private:
#endif /* LTE_TEST_UPLINK_SINR_H */
} // namespace ns3

View File

@@ -36,7 +36,7 @@
NS_LOG_COMPONENT_DEFINE ("LteAntennaTest");
using namespace ns3;
namespace ns3 {
@@ -221,3 +221,7 @@ LteAntennaTestSuite::LteAntennaTestSuite ()
}
static LteAntennaTestSuite lteAntennaTestSuite;
} // namespace ns3

View File

@@ -157,28 +157,9 @@ def build(bld):
'model/epc-gtpu-header.h',
'model/epc-enb-application.h',
'model/epc-sgw-pgw-application.h',
'test/lte-test-downlink-sinr.h',
'test/lte-test-uplink-sinr.h',
'test/lte-test-link-adaptation.h',
'test/lte-test-interference.h',
'test/lte-test-sinr-chunk-processor.h',
'test/lte-test-ue-phy.h',
'test/lte-test-rr-ff-mac-scheduler.h',
'test/lte-test-pf-ff-mac-scheduler.h',
'test/lte-test-phy-error-model.h',
'test/lte-test-pathloss-model.h',
'test/epc-test-gtpu.h',
'test/lte-test-entities.h',
'test/lte-simple-net-device.h',
'test/lte-simple-helper.h',
'test/lte-test-rlc-um-transmitter.h',
'test/lte-test-rlc-am-transmitter.h',
'test/lte-test-rlc-um-e2e.h',
'test/lte-test-rlc-am-e2e.h',
'model/epc-tft.h',
'model/epc-tft-classifier.h',
'model/lte-mi-error-model.h',
'test/lte-test-mimo.h'
]
if (bld.env['ENABLE_EXAMPLES']):