diff options
| author |   Hanoh Haim <hhaim@cisco.com> | 2015-12-14 16:18:53 +0200 |
|---|---|---|
| committer | Hanoh Haim <hhaim@cisco.com> | 2015-12-14 16:18:53 +0200 |
| commit | 07ae99efd4a946c1dbb13ad618508fb84a087bb6 (patch) | |
| tree | 75d12162446d96bb8be82cf4a4e1ce26a1138aa6 /src | |
| parent | a3611f0f06cb8fca0692eab5e4aafd5827fb88cc (diff) | |
fix merge issues
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtest/trex_stateless_gtest.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/gtest/trex_stateless_gtest.cpp b/src/gtest/trex_stateless_gtest.cpp index da652599..b80067b4 100644 --- a/src/gtest/trex_stateless_gtest.cpp +++ b/src/gtest/trex_stateless_gtest.cpp @@ -1964,11 +1964,12 @@ TEST_F(basic_stl, vm_enable0) { // stream - clean - TrexStreamsCompiledObj comp_obj(port_id, 1.0 /*mul*/); - assert(compile.compile(streams, comp_obj) ); + std::vector<TrexStreamsCompiledObj *> objs; + + assert(compile.compile(port_id,streams, objs) ); - TrexStatelessDpStart * lpstart = new TrexStatelessDpStart(port_id, 0, comp_obj.clone(), 10.0 /*sec */ ); + TrexStatelessDpStart * lpstart = new TrexStatelessDpStart(port_id, 0, objs[0], 10.0 /*sec */ ); t1.m_msg = lpstart; @@ -1980,6 +1981,7 @@ TEST_F(basic_stl, vm_enable0) { EXPECT_EQ_UINT32(1, res?1:0)<< "pass"; } + TEST_F(basic_stl, vm_enable1) { CBasicStl t1; @@ -2014,11 +2016,12 @@ TEST_F(basic_stl, vm_enable1) { // stream - clean - TrexStreamsCompiledObj comp_obj(port_id, 1.0 /*mul*/); - assert(compile.compile(streams, comp_obj) ); + std::vector<TrexStreamsCompiledObj *> objs; - TrexStatelessDpStart * lpstart = new TrexStatelessDpStart(port_id, 0, comp_obj.clone(), 10.0 /*sec */ ); + assert(compile.compile(port_id,streams, objs) ); + + TrexStatelessDpStart * lpstart = new TrexStatelessDpStart(port_id, 0, objs[0], 10.0 /*sec */ ); t1.m_msg = lpstart; @@ -2064,11 +2067,10 @@ TEST_F(basic_stl, vm_enable2) { // stream - clean - TrexStreamsCompiledObj comp_obj(port_id, 1.0 /*mul*/); - - assert(compile.compile(streams, comp_obj) ); + std::vector<TrexStreamsCompiledObj *> objs; + assert(compile.compile(port_id,streams, objs) ); - TrexStatelessDpStart * lpstart = new TrexStatelessDpStart(port_id, 0, comp_obj.clone(), 10.0 /*sec */ ); + TrexStatelessDpStart * lpstart = new TrexStatelessDpStart(port_id, 0, objs[0], 10.0 /*sec */ ); t1.m_msg = lpstart; |