Run all tests if none are specified.

2 files changed, 8 insertions, 4 deletions

diff --git a/mesonbuild/scripts/meson_test.py b/mesonbuild/scripts/meson_test.py
index 24b8bac..5538d84 100755
--- a/mesonbuild/scripts/meson_test.py
+++ b/mesonbuild/scripts/meson_test.py
@@ -45,7 +45,7 @@ parser.add_argument('--logbase', default='testlog',
                     help="Base name for log file.")
 parser.add_argument('--num-processes', default=None,
                     help='How many parallel processes to use.')
-parser.add_argument('args', nargs='+')
+parser.add_argument('args', nargs='*')
 
 
 class TestRun():
@@ -231,9 +231,10 @@ def run_tests(datafilename, log_base, num_workers=None):
         logfilename = logfile_base + '.txt'
         jsonlogfilename = logfile_base+ '.json'
     else:
-        wrap = [options.wrapper]
-        logfilename = logfile_base + '-' + options.wrapper.replace(' ', '_') + '.txt'
-        jsonlogfilename = logfile_base + '-' + options.wrapper.replace(' ', '_') + '.json'
+        wrap = options.wrapper.split()
+        namebase = wrap[0]
+        logfilename = logfile_base + '-' + namebase.replace(' ', '_') + '.txt'
+        jsonlogfilename = logfile_base + '-' + namebase.replace(' ', '_') + '.json'
     with open(datafilename, 'rb') as f:
         tests = pickle.load(f)
     if len(tests) == 0:
diff --git a/mesontest.py b/mesontest.py
index 3ab8ef3..1695faf 100755
--- a/mesontest.py
+++ b/mesontest.py
@@ -54,6 +54,9 @@ def gdbrun(test):
 def run(args):
     datafile = 'meson-private/meson_test_setup.dat'
     options = parser.parse_args(args)
+    if len(options.tests) == 0:
+        # Run basic tests.
+        return meson_test.run(args + ['meson-private/meson_test_setup.dat'])
     if options.wrapper != '':
         wrap = options.wrapper.split(' ')
     else: