mesontest: Fix --repeat with --gdb

It would add --args to `wrap` repeatedly for each re-run, resulting in
gdb erroring out with `--args: No such file or directory.`

Also don't make --gdb and --wrapper mutually exclusive. Sometimes people
want to run under a wrapper *and* run it under gdb.

1 files changed, 3 insertions, 3 deletions

diff --git a/mesontest.py b/mesontest.py
index ef5cff6..0cccfe2 100755
--- a/mesontest.py
+++ b/mesontest.py
@@ -421,7 +421,9 @@ TIMEOUT: %4d
             wrap = ['gdb', '--quiet', '--nh']
             if self.options.repeat > 1:
                 wrap += ['-ex', 'run', '-ex', 'quit']
-        elif self.options.wrapper:
+            # Signal the end of arguments to gdb
+            wrap += ['--args']
+        if self.options.wrapper:
             wrap += self.options.wrapper
         assert(isinstance(wrap, list))
         return wrap
@@ -452,8 +454,6 @@ TIMEOUT: %4d
 
                     if self.options.gdb:
                         test.timeout = None
-                        if len(test.cmd_args):
-                            wrap.append('--args')
 
                     if not test.is_parallel or self.options.gdb:
                         self.drain_futures(futures, logfile, jsonlogfile)