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

2021-07-06 Thread Michał Górny via Phabricator via cfe-commits 
This revision was automatically updated to reflect the committed changes.
Closed by commit rG2d68bb1765f9: [compiler-rt] [test] Fix asan symbolize tests 
on py3.10 (authored by mgorny).
Herald added a project: Sanitizers.
Herald added a subscriber: Sanitizers.

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D105489/new/

https://reviews.llvm.org/D105489

Files:
  
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


Index: 
compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cpp
===
--- 
compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cpp
+++ 
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
 
Index: 
compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cpp
===
--- 
compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cpp
+++ 
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


Index: compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cpp
===
--- compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cpp
+++ 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
 
Index: compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cpp
===
--- compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cpp
+++ 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
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

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

2021-07-06 Thread Dan Liew via Phabricator via cfe-commits 
delcypher accepted this revision.
delcypher added a comment.
This revision is now accepted and ready to land.

LGTM


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D105489/new/

https://reviews.llvm.org/D105489

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

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

2021-07-06 Thread Michał Górny via Phabricator via cfe-commits 
mgorny created this revision.
mgorny added a reviewer: delcypher.
Herald added a subscriber: dberris.
mgorny requested review of this revision.

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


https://reviews.llvm.org/D105489

Files:
  
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


Index: 
compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cpp
===
--- 
compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cpp
+++ 
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
 
Index: 
compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cpp
===
--- 
compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cpp
+++ 
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


Index: compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cpp
===
--- compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/plugin_no_op_help_output.cpp
+++ 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
 
Index: compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cpp
===
--- compiler-rt/test/asan/TestCases/Posix/asan_symbolize_script/logging_options_in_help.cpp
+++ 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
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits