Allow both - and _ for all options in test.py

Change-Id: Id886f509e8541ffb938732b5efc536787d6248c0
diff --git a/tools/test.py b/tools/test.py
index 4ce6453..ef8fc30 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -106,9 +106,11 @@
   result.add_option('--use-golden-files-in', '--use_golden_files_in',
       help='Download golden files hierarchy for this commit in the specified'
            ' location and use them instead of executing on host runtime.')
-  result.add_option('--no_r8lib', '--no_r8lib', default=False, action='store_true',
+  result.add_option('--no-r8lib', '--no_r8lib',
+      default=False, action='store_true',
       help='Run the tests on R8 full with relocated dependencies.')
-  result.add_option('--r8lib_no_deps', '--r8lib_no_deps', default=False, action='store_true',
+  result.add_option('--r8lib-no-deps', '--r8lib_no_deps',
+      default=False, action='store_true',
       help='Run the tests on r8lib without relocated dependencies.')
   return result.parse_args()