Skip to content

Commit 3a1ddfe

Browse files
lr-wpan, lte: (fixes #1228) Add missing SetDataDir calls in tests
Prevents failures when using test.py -u
1 parent 3670857 commit 3a1ddfe

21 files changed

+36
-7
lines changed

src/lr-wpan/test/lr-wpan-ack-test.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ LrWpanAckTestCase::DataConfirmDev1(McpsDataConfirmParams params)
158158
void
159159
LrWpanAckTestCase::DoRun()
160160
{
161+
SetDataDir(NS_TEST_SOURCEDIR);
162+
161163
// Test setup:
162164
// Two nodes well in communication range.
163165
// Node 1 sends a request packet to node 2 with ACK request bit set. Node 2

src/lte/test/lte-test-carrier-aggregation.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ CarrierAggregationTestCase::DoRun()
361361
{
362362
NS_LOG_FUNCTION(this << m_nUser << m_dist << m_dlBandwidth << m_ulBandwidth
363363
<< m_numberOfComponentCarriers);
364+
SetDataDir(NS_TEST_SOURCEDIR);
364365

365366
Config::SetDefault("ns3::LteEnbNetDevice::DlEarfcn", UintegerValue(100));
366367
Config::SetDefault("ns3::LteEnbNetDevice::UlEarfcn", UintegerValue(100 + 18000));

src/lte/test/lte-test-cqa-ff-mac-scheduler.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ void
292292
LenaCqaFfMacSchedulerTestCase1::DoRun()
293293
{
294294
NS_LOG_FUNCTION(this << GetName());
295+
SetDataDir(NS_TEST_SOURCEDIR);
295296

296297
if (!m_errorModelEnabled)
297298
{
@@ -561,6 +562,8 @@ LenaCqaFfMacSchedulerTestCase2::~LenaCqaFfMacSchedulerTestCase2()
561562
void
562563
LenaCqaFfMacSchedulerTestCase2::DoRun()
563564
{
565+
SetDataDir(NS_TEST_SOURCEDIR);
566+
564567
if (!m_errorModelEnabled)
565568
{
566569
Config::SetDefault("ns3::LteSpectrumPhy::CtrlErrorModelEnabled", BooleanValue(false));

src/lte/test/lte-test-deactivate-bearer.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ LenaDeactivateBearerTestCase::~LenaDeactivateBearerTestCase()
129129
void
130130
LenaDeactivateBearerTestCase::DoRun()
131131
{
132+
SetDataDir(NS_TEST_SOURCEDIR);
132133
uint32_t originalSeed = RngSeedManager::GetSeed();
133134
uint32_t originalRun = RngSeedManager::GetRun();
134135
RngSeedManager::SetSeed(1);

src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ LenaFdBetFfMacSchedulerTestCase1::~LenaFdBetFfMacSchedulerTestCase1()
221221
void
222222
LenaFdBetFfMacSchedulerTestCase1::DoRun()
223223
{
224+
SetDataDir(NS_TEST_SOURCEDIR);
224225
if (!m_errorModelEnabled)
225226
{
226227
Config::SetDefault("ns3::LteSpectrumPhy::CtrlErrorModelEnabled", BooleanValue(false));
@@ -403,6 +404,7 @@ void
403404
LenaFdBetFfMacSchedulerTestCase2::DoRun()
404405
{
405406
NS_LOG_FUNCTION(this);
407+
SetDataDir(NS_TEST_SOURCEDIR);
406408

407409
if (!m_errorModelEnabled)
408410
{

src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ void
198198
LenaFdMtFfMacSchedulerTestCase::DoRun()
199199
{
200200
NS_LOG_FUNCTION(this << m_nUser << m_dist);
201-
201+
SetDataDir(NS_TEST_SOURCEDIR);
202202
if (!m_errorModelEnabled)
203203
{
204204
Config::SetDefault("ns3::LteSpectrumPhy::CtrlErrorModelEnabled", BooleanValue(false));

src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ void
293293
LenaFdTbfqFfMacSchedulerTestCase1::DoRun()
294294
{
295295
NS_LOG_FUNCTION(this << GetName());
296-
296+
SetDataDir(NS_TEST_SOURCEDIR);
297297
if (!m_errorModelEnabled)
298298
{
299299
Config::SetDefault("ns3::LteSpectrumPhy::CtrlErrorModelEnabled", BooleanValue(false));
@@ -568,6 +568,8 @@ LenaFdTbfqFfMacSchedulerTestCase2::~LenaFdTbfqFfMacSchedulerTestCase2()
568568
void
569569
LenaFdTbfqFfMacSchedulerTestCase2::DoRun()
570570
{
571+
SetDataDir(NS_TEST_SOURCEDIR);
572+
571573
if (!m_errorModelEnabled)
572574
{
573575
Config::SetDefault("ns3::LteSpectrumPhy::CtrlErrorModelEnabled", BooleanValue(false));

src/lte/test/lte-test-harq.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ LenaHarqTestCase::~LenaHarqTestCase()
9696
void
9797
LenaHarqTestCase::DoRun()
9898
{
99+
SetDataDir(NS_TEST_SOURCEDIR);
99100
Config::SetDefault("ns3::LteAmc::Ber", DoubleValue(m_amcBer));
100101
Config::SetDefault("ns3::LteAmc::AmcModel", EnumValue(LteAmc::PiroEW2010));
101102
Config::SetDefault("ns3::LteSpectrumPhy::CtrlErrorModelEnabled", BooleanValue(false));

src/lte/test/lte-test-link-adaptation.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ LteLinkAdaptationTestCase::~LteLinkAdaptationTestCase()
127127
void
128128
LteLinkAdaptationTestCase::DoRun()
129129
{
130+
SetDataDir(NS_TEST_SOURCEDIR);
130131
Config::Reset();
131132
Config::SetDefault("ns3::LteAmc::AmcModel", EnumValue(LteAmc::PiroEW2010));
132133
Config::SetDefault("ns3::LteAmc::Ber", DoubleValue(0.00005));

src/lte/test/lte-test-mimo.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ void
113113
LenaMimoTestCase::DoRun()
114114
{
115115
NS_LOG_FUNCTION(this << GetName());
116+
SetDataDir(NS_TEST_SOURCEDIR);
116117
Config::SetDefault("ns3::LteSpectrumPhy::DataErrorModelEnabled", BooleanValue(false));
117118
Config::SetDefault("ns3::LteAmc::AmcModel", EnumValue(LteAmc::PiroEW2010));
118119
Config::SetDefault("ns3::LteHelper::UseIdealRrc", BooleanValue(m_useIdealRrc));

0 commit comments

Comments
 (0)