ICU-21520 Fixes typo in name of test data file; removes a regex that

evaluates to the empty string and the result files are missing the
perf test name as a result. E.g. '_Mar_16_155820.html' instead of
'unisetperf_Mar_16_155820.html'.
Not obvious why the regex was even created since it doesn't seem
necessary because the name of the caller doesn't require additional
parsing. The rpaticular code is from 2002, maybe changes in Perl
account for the issue(?)

diff --git a/icu4c/source/test/perf/normperf/NormPerf.pl b/icu4c/source/test/perf/normperf/NormPerf.pl
index a37e28cd7edeafc3501e8d19a8c0402c8f71e14f..5c16212b84e43c8bc75499d8055acc8e10caffcc 100755 (executable)
--- a/icu4c/source/test/perf/normperf/NormPerf.pl
+++ b/icu4c/source/test/perf/normperf/NormPerf.pl
@@ -53,7 +53,7 @@ my $dataFiles = {
         "TestNames_SerbianSH.txt",
         "TestNames_SerbianSR.txt",
         "TestNames_Thai.txt",
-        "Testnames_Russian.txt",
+        "TestNames_Russian.txt",
         "th18057.txt",
         "thesis.txt",
         "vfear11a.txt",

diff --git a/icu4c/source/test/perf/normperf/NormPerf_r.pl b/icu4c/source/test/perf/normperf/NormPerf_r.pl
index 673afef1527b02d168ba44678fe5cca8f337fa52..e81c242573ef7634435299428a1fb21ad6c6fdbc 100755 (executable)
--- a/icu4c/source/test/perf/normperf/NormPerf_r.pl
+++ b/icu4c/source/test/perf/normperf/NormPerf_r.pl
@@ -55,7 +55,7 @@ my $dataFiles = {
         "TestNames_SerbianSH.txt",
         "TestNames_SerbianSR.txt",
         "TestNames_Thai.txt",
-        "Testnames_Russian.txt",
+        "TestNames_Russian.txt",
         "th18057.txt",
         "thesis.txt",
         "vfear11a.txt",

diff --git a/icu4c/source/test/perf/perldriver/Output.pm b/icu4c/source/test/perf/perldriver/Output.pm
index 3e74bc966fdf3633241515554bd2d102976df661..8f6e45c8fa0e3f9a8cd22ce4f042f9385e6c9cd8 100644 (file)
--- a/icu4c/source/test/perf/perldriver/Output.pm
+++ b/icu4c/source/test/perf/perldriver/Output.pm
@@ -190,8 +190,6 @@ sub setupOutput {
   @headers = split(/ /, $headers);
   my ($t, $rest);
   ($t, $rest) = split(/\.\w+/, $0);
-  $t =~ /^.*\W(\w+)$/;
-  $t = $1;
   if($outType eq 'HTML') {
     $html = $date;
     $html =~ s/://g; # ':' illegal

diff --git a/icu4c/source/test/perf/ubrkperf/UBrkPerf_r.pl b/icu4c/source/test/perf/ubrkperf/UBrkPerf_r.pl
index 34c5f1fc9c6c8276e4b940a9b798e9d6ada91cfc..8b4459621526cb128e2d263b093e14c1d3523830 100755 (executable)
--- a/icu4c/source/test/perf/ubrkperf/UBrkPerf_r.pl
+++ b/icu4c/source/test/perf/ubrkperf/UBrkPerf_r.pl
@@ -72,7 +72,7 @@ my $dataFiles = {
         "TestNames_SerbianSH.txt",
         "TestNames_SerbianSR.txt",
         "TestNames_Thai.txt",
-        "Testnames_Russian.txt",
+        "TestNames_Russian.txt",
     ],
     "th",
     [

diff --git a/icu4c/source/test/perf/ustrperf/StringPerf.pl b/icu4c/source/test/perf/ustrperf/StringPerf.pl
index 378cbc125e0c8dbac245510a83127fd15e3eb5d0..54f905fdbc48d232ebd9772dec44f6761fb0e792 100755 (executable)
--- a/icu4c/source/test/perf/ustrperf/StringPerf.pl
+++ b/icu4c/source/test/perf/ustrperf/StringPerf.pl
@@ -68,7 +68,7 @@ my $dataFiles = {
         "TestNames_SerbianSH.txt",
         "TestNames_SerbianSR.txt",
         "TestNames_Thai.txt",
-        "Testnames_Russian.txt",
+        "TestNames_Russian.txt",
         "th18057.txt",
     ]
 };

diff --git a/icu4c/source/test/perf/ustrperf/StringPerf_r.pl b/icu4c/source/test/perf/ustrperf/StringPerf_r.pl
index 587595083b08ddc7c18e905e8bcf30e98958ec75..e2c8faf89ee029f11008ae88d0b816afaf05fbd4 100755 (executable)
--- a/icu4c/source/test/perf/ustrperf/StringPerf_r.pl
+++ b/icu4c/source/test/perf/ustrperf/StringPerf_r.pl
@@ -54,7 +54,7 @@ my $dataFiles = {
         "TestNames_SerbianSH.txt",
         "TestNames_SerbianSR.txt",
         "TestNames_Thai.txt",
-        "Testnames_Russian.txt",
+        "TestNames_Russian.txt",
         "th18057.txt",
         "thesis.txt",
         "vfear11a.txt",