diff options
| author |   Dan Klein <danklei@cisco.com> | 2015-10-22 05:31:22 +0300 |
|---|---|---|
| committer | Dan Klein <danklei@cisco.com> | 2015-10-22 05:31:22 +0300 |
| commit | f5c4a8051d697c086eb0d1c8ce3ac90ab245d249 (patch) | |
| tree | fb0d379947c4b1984b77f6594d27f96d72c3cba0 /linux/ws_main.py | |
| parent | 508703e11a3fad3e44535c5433f803d77f28e245 (diff) | |
| parent | 876c76572fdb2fb8f0e8db21bc420d284dc05950 (diff) | |
Merge branch 'master' into dan_stateless
Diffstat (limited to 'linux/ws_main.py')
| -rwxr-xr-x | linux/ws_main.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/linux/ws_main.py b/linux/ws_main.py index 8ad3e5ba..eac46ac7 100755 --- a/linux/ws_main.py +++ b/linux/ws_main.py @@ -142,15 +142,18 @@ net_src = SrcGroup(dir='src/common/Network/Packet', # stateless code stateless_src = SrcGroup(dir='src/stateless/', - src_list=['trex_stream.cpp', - 'trex_stream_vm.cpp', - 'trex_stateless.cpp', + src_list=['cp/trex_stream.cpp', + 'cp/trex_stream_vm.cpp', + 'cp/trex_stateless.cpp', + 'cp/trex_stateless_port.cpp', + 'dp/trex_stateless_dp_core.cpp' ]) # RPC code rpc_server_src = SrcGroup(dir='src/rpc-server/', src_list=[ 'trex_rpc_server.cpp', 'trex_rpc_req_resp_server.cpp', + 'trex_rpc_async_server.cpp', 'trex_rpc_jsonrpc_v2_parser.cpp', 'trex_rpc_cmds_table.cpp', 'trex_rpc_cmd.cpp', @@ -162,10 +165,12 @@ rpc_server_src = SrcGroup(dir='src/rpc-server/', ]) # RPC mock server (test) -rpc_server_mock_src = SrcGroup(dir='src/rpc-server/', +rpc_server_mock_src = SrcGroup(dir='src/mock/', src_list=[ 'trex_rpc_server_mock.cpp', '../gtest/rpc_test.cpp', + '../pal/linux/mbuf.cpp', + '../os_time.cpp', ]) # JSON package @@ -233,8 +238,10 @@ cxxflags_base =['-DWIN_UCODE_SIM', includes_path =''' ../src/pal/linux/ ../src/ + ../src/mock/ ../src/rpc-server/ - ../src/stateless/ + ../src/stateless/cp/ + ../src/stateless/dp/ ../external_libs/json/ ../external_libs/zmq/include/ ../external_libs/yaml-cpp/include/ |