[compiler-rt] 2d68bb1 - [compiler-rt] [test] Fix asan symbolize tests on py3.10

[Michał Górny via llvm-commits]

Author: Michał Górny
Date: 2021-07-06T20:41:35+02:00
New Revision: 2d68bb1765f978f0426f1face22e4ff37439a224

URL: https://github.com/llvm/llvm-project/commit/2d68bb1765f978f0426f1face22e4ff37439a224
DIFF: https://github.com/llvm/llvm-project/commit/2d68bb1765f978f0426f1face22e4ff37439a224.diff

LOG: [compiler-rt] [test] Fix asan symbolize tests on py3.10

Update the asan_symbolize_script for changes in argparse output
in Python 3.10.  The parser output 'options' instead of 'optional
arguments'.

Differential Revision: https://reviews.llvm.org/D105489

Added: 
    

Modified: 
    compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cpp
    compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cpp b/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cpp
index b3df1cb354b15..9c73727c0b2f7 100644
--- a/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cpp
+++ b/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cpp
@@ -1,5 +1,5 @@
 // RUN: %asan_symbolize --help > %t_help_output.txt
 // RUN: FileCheck %s -input-file=%t_help_output.txt
-// CHECK: optional arguments:
+// CHECK: option{{al arguments|s}}:
 // CHECK: --log-dest
 // CHECK: --log-level

diff  --git a/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cpp b/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cpp
index 71f32e0d6d525..4dc19880eca60 100644
--- a/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cpp
+++ b/compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cpp
@@ -2,6 +2,6 @@
 // RUN: %asan_symbolize --log-level info --plugins %S/plugin_no_op.py --help 2>&1 | FileCheck %s
 // CHECK: Registering plugin NoOpPlugin
 // CHECK: Adding --unlikely-option-name-XXX option
-// CHECK: optional arguments:
+// CHECK: option{{al arguments|s}}:
 // CHECK: --unlikely-option-name-XXX