issue: 362719 Updated the Benchmarks related files to not use the -m …

…parameter. Change-Id: Ifa9cb0a19f95feb2b9a57cf60ddd985d3895327e
accelio · Feb 26, 2014 · 2c38c7d · 2c38c7d
1 parent b9bcb23
commit 2c38c7d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/cases/jx_benchmarks.cases b/cases/jx_benchmarks.cases
@@ -16,7 +16,7 @@
 		<tout>1500</tout>
 		<cmd>
 			<params>
-				<static_args>-p_server 4653 -t_server 1 -i_server 64 -o_server 0 -u_server 1 -p_client 4653 -t_client 1 -i_client 0 -o_client 64 -m_client 2 -u_client 1 -r_client 10</static_args>
+				<static_args>-p_server 4653 -t_server 1 -i_server 64 -o_server 0 -u_server 1 -p_client 4653 -t_client 1 -i_client 0 -o_client 64 -u_client 1 -r_client 10</static_args>
 			</params>
 		</cmd>
 	</case>

diff --git a/cases/jx_benchmarks_wrapper.py b/cases/jx_benchmarks_wrapper.py
@@ -23,15 +23,15 @@ def configure_parser(self):
         self.add_client_cmd_argument('-t_client', help='t.', type=str, alias='-t', value_only=True, priority=3)
         self.add_client_cmd_argument('-i_client', help='i.', type=str, alias='-i', value_only=True, priority=4)
         self.add_client_cmd_argument('-o_client', help='o.', type=str, alias='-o', value_only=True, priority=5)
-        self.add_client_cmd_argument('-u_client', help='u.', type=str, alias='-u', value_only=True, priority=7)
-        self.add_client_cmd_argument('-r_client', help='r.', type=str, alias='-r', value_only=True, priority=8)
+        self.add_client_cmd_argument('-u_client', help='u.', type=str, alias='-u', value_only=True, priority=6)
+        self.add_client_cmd_argument('-r_client', help='r.', type=str, alias='-r', value_only=True, priority=7)
 
         self.add_server_cmd_argument('-p_server', help='The port.', type=str, alias='-p', value_only=True, priority=2)
         self.add_server_cmd_argument('-t_server', help='t.', type=str, alias='-t', value_only=True, priority=3)
         self.add_server_cmd_argument('-i_server', help='i.', type=str, alias='-i', value_only=True, priority=4)
         self.add_server_cmd_argument('-o_server', help='o.', type=str, alias='-o', value_only=True, priority=5)
-        self.add_server_cmd_argument('-u_server', help='u.', type=str, alias='-u', value_only=True, priority=7)
-        self.add_server_cmd_argument('-r_server', help='r.', type=str, alias='-r', value_only=True, priority=8)
+        self.add_server_cmd_argument('-u_server', help='u.', type=str, alias='-u', value_only=True, priority=6)
+        self.add_server_cmd_argument('-r_server', help='r.', type=str, alias='-r', value_only=True, priority=7)
 
 
     def get_server_manage_ip(self):

diff --git a/cases/runBenchmarkTest.sh b/cases/runBenchmarkTest.sh
@@ -4,16 +4,16 @@ TOP_DIR=$DIR/..
 cd $DIR
 
 # Define Parameters
-if [ ! -z ${10} ]; then
-	r_option="-r ${10}"
+if [ ! -z $9 ]; then
+	r_option="-r $9"
 fi
 ip=`echo $3 | sed 's/172.30.21/36.0.0/g'`
 
 # Run the benchmarks
 let "run_stat=1"
 echo -e "\nRunning benchmarks...."
 bash $TOP_DIR/cases/timeout.sh $1 &
-python ${TOP_DIR}/tests/runJBenchmarkTest.py $2 -a ${ip} -p $4 -t $5 -i $6 -o $7 -m $8 -u $9 ${r_option}
+python ${TOP_DIR}/tests/runJBenchmarkTest.py $2 -a ${ip} -p $4 -t $5 -i $6 -o $7 -u $8 ${r_option}
 
 # Kill processes on server
 echo -e "\nRunning JXIO processes on server...".