X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/46f4442e9a5a4f3b98b7c1083586332f6a8a99a4..2ca993e82fb37b597a3c73ecd1586a139a6579c5:/icuSources/test/perf/ustrperf/StringPerf_r.pl

diff --git a/icuSources/test/perf/ustrperf/StringPerf_r.pl b/icuSources/test/perf/ustrperf/StringPerf_r.pl
old mode 100644
new mode 100755
index a8cf3987..69f4f972
--- a/icuSources/test/perf/ustrperf/StringPerf_r.pl
+++ b/icuSources/test/perf/ustrperf/StringPerf_r.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #  ********************************************************************
 #  * COPYRIGHT:
-#  * Copyright (c) 2002-2008, International Business Machines
+#  * Copyright (c) 2002-2013, International Business Machines
 #  * Corporation and others. All Rights Reserved.
 #  ********************************************************************
 
@@ -14,15 +14,15 @@ require "../perldriver/Common.pl";
 use PerfFramework;
 
 my $options = {
-	       "title"=>"Unicode String performance regression: ICU (".$ICUPreviousVersion." and ".$ICULatestVersion.")",
-           "headers"=>"ICU".$ICUPreviousVersion." ICU".$ICULatestVersion,
-	       "operationIs"=>"Unicode String",
-	       "passes"=>"10",
-	       "time"=>"5",
-	       #"outputType"=>"HTML",
-	       "dataDir"=>$CollationDataPath,
-           "outputDir"=>"../results"
-	      };
+    "title"=>"Unicode String performance regression: ICU (".$ICUPreviousVersion." and ".$ICULatestVersion.")",
+    "headers"=>"ICU".$ICUPreviousVersion." ICU".$ICULatestVersion,
+    "operationIs"=>"Unicode String",
+    "passes"=>"10",
+    "time"=>"5",
+    #"outputType"=>"HTML",
+    "dataDir"=>$CollationDataPath,
+    "outputDir"=>"../results"
+};
 
 # programs
 
@@ -30,47 +30,47 @@ my $p1; # Previous
 my $p2; # Latest
 
 if ($OnWindows) {
-	$p1 = $ICUPathPrevious."/ustrperf/Release/stringperf.exe -b -u"; # Previous
-    $p2 = $ICUPathLatest."/ustrperf/Release/stringperf.exe -b -u"; # Latest
+    $p1 = "cd ".$ICUPrevious."/bin && ".$ICUPathPrevious."/ustrperf/$WindowsPlatform/Release/stringperf.exe -b -u"; # Previous
+    $p2 = "cd ".$ICULatest."/bin && ".$ICUPathLatest."/ustrperf/$WindowsPlatform/Release/stringperf.exe -b -u"; # Latest
 } else {
-	$p1 = $ICUPathPrevious."/ustrperf/stringperf -b -u"; # Previous
-    $p2 = $ICUPathLatest."/ustrperf/stringperf -b -u"; # Latest
+    $p1 = "LD_LIBRARY_PATH=".$ICUPrevious."/source/lib:".$ICUPrevious."/source/tools/ctestfw ".$ICUPathPrevious."/ustrperf/stringperf -b -u"; # Previous
+    $p2 = "LD_LIBRARY_PATH=".$ICULatest."/source/lib:".$ICULatest."/source/tools/ctestfw ".$ICUPathLatest."/ustrperf/stringperf -b -u"; # Latest
 }
 
 my $dataFiles = {
-		 "",
-		 [
-		  "TestNames_Asian.txt",
-		  "TestNames_Chinese.txt",
-		  "TestNames_Japanese.txt",
-		  "TestNames_Japanese_h.txt",
-		  "TestNames_Japanese_k.txt",
-		  "TestNames_Korean.txt",
-		  "TestNames_Latin.txt",
-		  "TestNames_SerbianSH.txt",
-		  "TestNames_SerbianSR.txt",
-		  "TestNames_Thai.txt",
-		  "Testnames_Russian.txt",
-		  "th18057.txt",
-		  "thesis.txt",
-		  "vfear11a.txt",
-		 ]
-		};
+    "",
+    [
+        "TestNames_Asian.txt",
+        "TestNames_Chinese.txt",
+        "TestNames_Japanese.txt",
+        "TestNames_Japanese_h.txt",
+        "TestNames_Japanese_k.txt",
+        "TestNames_Korean.txt",
+        "TestNames_Latin.txt",
+        "TestNames_SerbianSH.txt",
+        "TestNames_SerbianSR.txt",
+        "TestNames_Thai.txt",
+        "Testnames_Russian.txt",
+        "th18057.txt",
+        "thesis.txt",
+        "vfear11a.txt",
+    ]
+};
 
 
 my $tests = { 
-"Object Construction(empty string)",      ["$p1 TestCtor"         , "$p2 TestCtor"         ],
-"Object Construction(single char)",       ["$p1 TestCtor1"        , "$p2 TestCtor1"        ],
-"Object Construction(another string)",    ["$p1 TestCtor2"        , "$p2 TestCtor2"        ],
-"Object Construction(string literal)",    ["$p1 TestCtor3"        , "$p2 TestCtor3"        ],
-"String Assignment(helper)",     		  ["$p1 TestAssign"       , "$p2 TestAssign"       ],
-"String Assignment(string literal)",      ["$p1 TestAssign1"      , "$p2 TestAssign1"      ],
-"String Assignment(another string)",      ["$p1 TestAssign2"      , "$p2 TestAssign2"      ],
-"Get String or Character",      		  ["$p1 TestGetch"        , "$p2 TestGetch"        ],
-"Concatenation",   						  ["$p1 TestCatenate"     , "$p2 TestCatenate"     ],
-"String Scanning(char)",     		      ["$p1 TestScan"         , "$p2 TestScan"         ],
-"String Scanning(string)",       		  ["$p1 TestScan1"        , "$p2 TestScan1"        ],
-"String Scanning(char set)",       	      ["$p1 TestScan2"        , "$p2 TestScan2"        ],
+    "Object Construction(empty string)",      ["$p1,TestCtor"         , "$p2,TestCtor"         ],
+    "Object Construction(single char)",       ["$p1,TestCtor1"        , "$p2,TestCtor1"        ],
+    "Object Construction(another string)",    ["$p1,TestCtor2"        , "$p2,TestCtor2"        ],
+    "Object Construction(string literal)",    ["$p1,TestCtor3"        , "$p2,TestCtor3"        ],
+    "String Assignment(helper)",              ["$p1,TestAssign"       , "$p2,TestAssign"       ],
+    "String Assignment(string literal)",      ["$p1,TestAssign1"      , "$p2,TestAssign1"      ],
+    "String Assignment(another string)",      ["$p1,TestAssign2"      , "$p2,TestAssign2"      ],
+    "Get String or Character",                ["$p1,TestGetch"        , "$p2,TestGetch"        ],
+    "Concatenation",                          ["$p1,TestCatenate"     , "$p2,TestCatenate"     ],
+    "String Scanning(char)",                  ["$p1,TestScan"         , "$p2,TestScan"         ],
+    "String Scanning(string)",                ["$p1,TestScan1"        , "$p2,TestScan1"        ],
+    "String Scanning(char set)",              ["$p1,TestScan2"        , "$p2,TestScan2"        ],
 };