From e768dc68155ba835882733753844a570d8384646 Mon Sep 17 00:00:00 2001 From: imarom Date: Sun, 25 Sep 2016 09:15:17 +0300 Subject: fixing up all gtests results (due to split now in order instead of segments) --- scripts/exp/stl_vm_inc_size_64_128-ex.pcap | Bin 3074 -> 3094 bytes scripts/exp/stl_vm_split_client_var.erf-0-ex.erf | Bin 11000 -> 11000 bytes scripts/exp/stl_vm_split_client_var.erf-0.erf | Bin 11000 -> 11000 bytes .../stl_vm_split_flow_var_big_range.erf-0-ex.erf | Bin 11000 -> 11000 bytes .../exp/stl_vm_split_flow_var_big_range.erf-0.erf | Bin 11000 -> 11000 bytes scripts/exp/stl_vm_split_flow_var_inc.erf-0-ex.erf | Bin 11000 -> 11000 bytes scripts/exp/stl_vm_split_flow_var_inc.erf-0.erf | Bin 11000 -> 11000 bytes .../stl_vm_split_flow_var_small_range.erf-0-ex.erf | Bin 11000 -> 11000 bytes .../exp/stl_vm_split_flow_var_small_range.erf-0.erf | Bin 11000 -> 11000 bytes src/gtest/trex_stateless_gtest.cpp | 14 +++++++------- 10 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/exp/stl_vm_inc_size_64_128-ex.pcap b/scripts/exp/stl_vm_inc_size_64_128-ex.pcap index 1e44c30f..fa09c51c 100644 Binary files a/scripts/exp/stl_vm_inc_size_64_128-ex.pcap and b/scripts/exp/stl_vm_inc_size_64_128-ex.pcap differ diff --git a/scripts/exp/stl_vm_split_client_var.erf-0-ex.erf b/scripts/exp/stl_vm_split_client_var.erf-0-ex.erf index 25b2a2bd..77f0a5f4 100644 Binary files a/scripts/exp/stl_vm_split_client_var.erf-0-ex.erf and b/scripts/exp/stl_vm_split_client_var.erf-0-ex.erf differ diff --git a/scripts/exp/stl_vm_split_client_var.erf-0.erf b/scripts/exp/stl_vm_split_client_var.erf-0.erf index f156bfe5..77f0a5f4 100644 Binary files a/scripts/exp/stl_vm_split_client_var.erf-0.erf and b/scripts/exp/stl_vm_split_client_var.erf-0.erf differ diff --git a/scripts/exp/stl_vm_split_flow_var_big_range.erf-0-ex.erf b/scripts/exp/stl_vm_split_flow_var_big_range.erf-0-ex.erf index d5ad29d8..f1252e96 100644 Binary files a/scripts/exp/stl_vm_split_flow_var_big_range.erf-0-ex.erf and b/scripts/exp/stl_vm_split_flow_var_big_range.erf-0-ex.erf differ diff --git a/scripts/exp/stl_vm_split_flow_var_big_range.erf-0.erf b/scripts/exp/stl_vm_split_flow_var_big_range.erf-0.erf index 9a386724..f1252e96 100644 Binary files a/scripts/exp/stl_vm_split_flow_var_big_range.erf-0.erf and b/scripts/exp/stl_vm_split_flow_var_big_range.erf-0.erf differ diff --git a/scripts/exp/stl_vm_split_flow_var_inc.erf-0-ex.erf b/scripts/exp/stl_vm_split_flow_var_inc.erf-0-ex.erf index a938b37c..79995f32 100644 Binary files a/scripts/exp/stl_vm_split_flow_var_inc.erf-0-ex.erf and b/scripts/exp/stl_vm_split_flow_var_inc.erf-0-ex.erf differ diff --git a/scripts/exp/stl_vm_split_flow_var_inc.erf-0.erf b/scripts/exp/stl_vm_split_flow_var_inc.erf-0.erf index e6b9b85b..79995f32 100644 Binary files a/scripts/exp/stl_vm_split_flow_var_inc.erf-0.erf and b/scripts/exp/stl_vm_split_flow_var_inc.erf-0.erf differ diff --git a/scripts/exp/stl_vm_split_flow_var_small_range.erf-0-ex.erf b/scripts/exp/stl_vm_split_flow_var_small_range.erf-0-ex.erf index 94e493fe..e3283c9f 100644 Binary files a/scripts/exp/stl_vm_split_flow_var_small_range.erf-0-ex.erf and b/scripts/exp/stl_vm_split_flow_var_small_range.erf-0-ex.erf differ diff --git a/scripts/exp/stl_vm_split_flow_var_small_range.erf-0.erf b/scripts/exp/stl_vm_split_flow_var_small_range.erf-0.erf index 0a13e822..e3283c9f 100644 Binary files a/scripts/exp/stl_vm_split_flow_var_small_range.erf-0.erf and b/scripts/exp/stl_vm_split_flow_var_small_range.erf-0.erf differ diff --git a/src/gtest/trex_stateless_gtest.cpp b/src/gtest/trex_stateless_gtest.cpp index 96a6d255..09942c57 100644 --- a/src/gtest/trex_stateless_gtest.cpp +++ b/src/gtest/trex_stateless_gtest.cpp @@ -244,7 +244,7 @@ TEST_F(basic_vm, vm0) { vm.add_instruction( new StreamVmInstructionFixChecksumIpv4(20) ); vm.add_instruction( new StreamVmInstructionFlowMan( "var1",8, - StreamVmInstructionFlowMan::FLOW_VAR_OP_INC,0,1,7 ) + StreamVmInstructionFlowMan::FLOW_VAR_OP_INC,1,1,7 ) ); vm.add_instruction( new StreamVmInstructionWriteToPkt( "var1",14, 0,true) ); @@ -257,7 +257,7 @@ TEST_F(basic_vm, vm1) { StreamVm vm; vm.add_instruction( new StreamVmInstructionFlowMan( "var1",1, - StreamVmInstructionFlowMan::FLOW_VAR_OP_INC,0,1,7 ) + StreamVmInstructionFlowMan::FLOW_VAR_OP_INC,1,1,7 ) ); vm.add_instruction( new StreamVmInstructionWriteToPkt( "var1",26, 0,true) ); @@ -2006,14 +2006,14 @@ TEST_F(basic_vm, vm_syn_attack) { vm.add_instruction( new StreamVmInstructionFlowMan( "src_port", 2, StreamVmInstructionFlowMan::FLOW_VAR_OP_RANDOM, - 0, + 1025, 1025, 65000)); vm.add_instruction( new StreamVmInstructionFlowMan( "dst_port", 2, StreamVmInstructionFlowMan::FLOW_VAR_OP_RANDOM, - 0, + 1025, 1025, 65000)); @@ -2158,7 +2158,7 @@ TEST_F(basic_vm, vm_inc_size_64_128) { vm.add_instruction( new StreamVmInstructionFlowMan( "rand_pkt_size_var", 2, // size var must be 16bit size StreamVmInstructionFlowMan::FLOW_VAR_OP_INC, - 127, + 128, 128, 256)); @@ -2187,7 +2187,7 @@ TEST_F(basic_vm, vm_random_size_64_128) { vm.add_instruction( new StreamVmInstructionFlowMan( "rand_pkt_size_var", 2, // size var must be 16bit size StreamVmInstructionFlowMan::FLOW_VAR_OP_RANDOM, - 0, + 128, 128, 256)); @@ -2221,7 +2221,7 @@ TEST_F(basic_vm, vm_random_size_64_127_128) { vm.add_instruction( new StreamVmInstructionFlowMan( "rand_pkt_size_var", 2, // size var must be 16bit size StreamVmInstructionFlowMan::FLOW_VAR_OP_RANDOM, - 127, + 128, 128, 256)); -- cgit 1.2.3-korg