Pass test log as argument to formatting perl program instead of inlining

No need to worry about escaping any perl-related chars.

RELNOTES:

--
MOS_MIGRATED_REVID=104207407

1 files changed, 3 insertions, 4 deletions

diff --git a/src/test/shell/unittest.bash b/src/test/shell/unittest.bash
index 2430e928ec..ace16fd4ee 100644
--- a/src/test/shell/unittest.bash
+++ b/src/test/shell/unittest.bash
@@ -426,8 +426,7 @@ function __trap_with_arg() {
 # arguments need to be escaped.
 function __log_to_test_report() {
     local node="$1"
-    # Escape '\', '{' and '}' character, since we are inlining the text in the perl expression.
-    local block=$(echo "$2" | sed -e 's/\([\{\}\\]\)/\\\1/g')
+    local block="$2"
     if [[ ! -e "$XML_OUTPUT_FILE" ]]; then
         local xml_header='<?xml version="1.0" encoding="UTF-8"?>'
         echo "$xml_header<testsuites></testsuites>" > $XML_OUTPUT_FILE
@@ -436,7 +435,7 @@ function __log_to_test_report() {
     # replace match on node with block and match
     # replacement expression only needs escaping for quotes
     perl -e "\
-\$input = q{$block}; \
+\$input = @ARGV[0]; \
 \$/=undef; \
 open FILE, '+<$XML_OUTPUT_FILE'; \
 \$content = <FILE>; \
@@ -444,7 +443,7 @@ if (\$content =~ /($node.*)\$/) { \
   seek FILE, 0, 0; \
   print FILE \$\` . \$input . \$1; \
 }; \
-close FILE"
+close FILE" "$block"
 }
 
 # Usage: <total> <passed>