svn commit: r1093930 - /subversion/trunk/tools/dev/benchmarks/suite1/run

[gs...@apache.org]

Author: gstein
Date: Sat Apr 16 06:03:07 2011
New Revision: 1093930

URL: http://svn.apache.org/viewvc?rev=1093930&view=rev
Log:
Update the 'run' script to make use of the new --svn switch to the
benchmarking script. This change also makes it clearer where devs can
alter the paths to the svn executables used for the test.

In r1092572, I (accidentally) altered the order of arguments to the
'combine' subcommand. The destination file was moved from the end to the
beginning. This revision updates the 'run' script to account for that
change.

* tools/dev/benchmarks/suite1/run:
  (SVN_1_6, SVN_trunk): new variables for the executables
  (use): removed; obsolete
  (batch): switch to use the --svn switch rather than tweaking the PATH
    via the use() function.
  (): adjust param order to the 'combine' calls

Modified:
    subversion/trunk/tools/dev/benchmarks/suite1/run

Modified: subversion/trunk/tools/dev/benchmarks/suite1/run
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/benchmarks/suite1/run?rev=1093930&r1=1093929&r2=1093930&view=diff
==============================================================================
--- subversion/trunk/tools/dev/benchmarks/suite1/run (original)
+++ subversion/trunk/tools/dev/benchmarks/suite1/run Sat Apr 16 06:03:07 2011
@@ -17,6 +17,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+SVN_1_6="$HOME/src/svn-1.6.x/subversion/svn/svn"
+SVN_trunk="$HOME/src/svn/subversion/svn/svn"
+
 benchmark="$PWD/benchmark.py"
 
 parent="$(date +"%Y%m%d-%H%M%S")"
@@ -27,25 +30,14 @@ pwd
 
 ORIGINAL_PATH="$PATH"
 
-use(){
-  svn="$1"
-  if [ "$svn" = "trunk" ]; then
-    export PATH="$HOME/pat/trunk/prefix/bin:$ORIGINAL_PATH"
-  else
-    export PATH="$HOME/pat/stable/prefix/bin:$ORIGINAL_PATH"
-  fi
-}
-
 
 batch(){
   levels="$1"
   spread="$2"
   N="$3"
   pre="${levels}x${spread}_"
-  use 1.6
-  "$benchmark" run ${pre}1.6 $levels $spread $N
-  use trunk
-  "$benchmark" run ${pre}trunk $levels $spread $N
+  "$benchmark" "--svn=${SVN_1_6}" run ${pre}1.6 $levels $spread $N
+  "$benchmark" "--svn=${SVN_trunk}" run ${pre}trunk $levels $spread $N
   echo 
   echo "Results for dir levels: $levels  spread: $spread"
   "$benchmark" compare ${pre}1.6 ${pre}trunk
@@ -83,11 +75,11 @@ echo
 echo =========================================================================
 echo
 echo "calculating total of 1.6..."
-"$benchmark" combine *x*_1.6 total_1.6
+"$benchmark" combine total_1.6 *x*_1.6
 
 echo
 echo "calculating total of trunk..."
-"$benchmark" combine *x*_trunk total_trunk
+"$benchmark" combine total_trunk *x*_trunk
 
 echo
 echo "comparing averaged totals..."