From 3d7ba6560ef59fad4ea0ed38a7a3ee57792daee3 Mon Sep 17 00:00:00 2001 From: gnrunge Date: Tue, 16 Mar 2021 16:32:07 -0700 Subject: [PATCH] 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(?) --- icu4c/source/test/perf/normperf/NormPerf.pl | 2 +- icu4c/source/test/perf/normperf/NormPerf_r.pl | 2 +- icu4c/source/test/perf/perldriver/Output.pm | 2 -- icu4c/source/test/perf/ubrkperf/UBrkPerf_r.pl | 2 +- icu4c/source/test/perf/ustrperf/StringPerf.pl | 2 +- icu4c/source/test/perf/ustrperf/StringPerf_r.pl | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/icu4c/source/test/perf/normperf/NormPerf.pl b/icu4c/source/test/perf/normperf/NormPerf.pl index a37e28cd7ed..5c16212b84e 100755 --- 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 673afef1527..e81c242573e 100755 --- 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 3e74bc966fd..8f6e45c8fa0 100644 --- 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 34c5f1fc9c6..8b445962152 100755 --- 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 378cbc125e0..54f905fdbc4 100755 --- 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 587595083b0..e2c8faf89ee 100755 --- 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", -- 2.40.0