scripts/test.py: improve -m option etc.

`-m` now accepts `:<branch>`, adding hard-coded default git repository
https://github.com/ArtifexSoftware/mupdf.git.

Removed --valgrind and --gdb; -T is better.

Author: julian-smith-artifex-com

scripts/test.py

@@ -120,9 +120,23 @@
     
     -m <location> | --mupdf <location>
         Location of local mupdf/ directory or 'git:...' to be used
-        when building PyMuPDF. [This sets environment variable
-        PYMUPDF_SETUP_MUPDF_BUILD, which is used by PyMuPDF/setup.py. If not
-        specified PyMuPDF will download its default mupdf .tgz.]
+        when building PyMuPDF.
+        
+        This sets environment variable PYMUPDF_SETUP_MUPDF_BUILD, which is used
+        by PyMuPDF/setup.py. If not specified PyMuPDF will download its default
+        mupdf .tgz.
+        
+        Additionally if <location> starts with ':' we use the remaining text as
+        the branch name and add https://github.com/ArtifexSoftware/mupdf.git.
+        
+        For example:
+        
+            -m "git:--branch master https://github.com/ArtifexSoftware/mupdf.git"
+            -m :master
+            
+            -m "git:--branch 1.26.x https://github.com/ArtifexSoftware/mupdf.git"
+            -m :1.26.x
+            
     
     -M 0|1
     --build-mupdf 0|1
@@ -181,8 +195,11 @@
     --timeout <seconds>
         Sets timeout when running tests.
     
-    -T <command> | --pytest-prefix <command>
-        Use specified prefix when running pytest. E.g. `gdb --args`.
+    -T <prefix>
+        Use specified prefix when running pytest, must be one of:
+            gdb
+            helgrind
+            vagrind
     
     -v 0|1|2
         0 - do not use a venv.
@@ -192,10 +209,6 @@
         2 - Use venv
         The default is 2.
     
-    --valgrind 0|1
-        Use valgrind in `test` or `buildtest`.
-        This will run `sudo apt update` and `sudo apt install valgrind`.
-
 Commands:
     
     build
@@ -376,12 +389,6 @@ def main(argv):
         elif arg == '-f':
             test_fitz = int(next(args))
 
-        elif arg == '--gdb':
-            _gdb = int(next(args))
-            if _gdb == 1:
-                pytest_prefix = 'gdb'
-            warnings += f'{arg=} is deprecated, use `-T gdb`.'
-        
         elif arg in ('-h', '--help'):
             show_help = True
 
@@ -395,6 +402,10 @@ def main(argv):
             _mupdf = next(args)
             if _mupdf == '-':
                 _mupdf = None
+            elif _mupdf.startswith(':'):
+                _branch = _mupdf[1:]
+                _mupdf = 'git:--branch {_branch} https://github.com/ArtifexSoftware/mupdf.git'
+                os.environ['PYMUPDF_SETUP_MUPDF_BUILD'] = _mupdf
             elif _mupdf.startswith('git:') or '://' in _mupdf:
                 os.environ['PYMUPDF_SETUP_MUPDF_BUILD'] = _mupdf
             else:
@@ -439,19 +450,15 @@ def main(argv):
         elif arg == '--timeout':
             test_timeout = float(next(args))
 
-        elif arg in ('-T', '--pytest-prefix'):
+        elif arg == '-T':
             pytest_prefix = next(args)
+            assert pytest_prefix in ('gdb', 'helgrind', 'valgrind'), \
+                    f'Unrecognised {pytest_prefix=}, should be one of: gdb valgrind helgrind.'
 
         elif arg == '-v':
             venv = int(next(args))
             assert venv in (0, 1, 2), f'Invalid {venv=} should be 0, 1 or 2.'
 
-        elif arg == '--valgrind':
-            _valgrind = int(next(args))
-            if _valgrind == 1:
-                pytest_prefix = 'valgrind'
-            warnings += f'{arg=} is deprecated, use `-T _valgrind`.'
-        
         elif arg in ('build', 'cibw', 'pyodide', 'test', 'wheel'):
             commands.append(arg)