Fix: restart test with custom run cmd

Make sure we can continue to run custom run commands as restart
tests, which we use for Python restart coverage.

Also fix the order of the added valgrind option, so that it can
be combined with any of the run commands.

Author: ax3l

regtest.py

@@ -669,15 +669,14 @@ def test_suite(argv):
 
             base_cmd += f" {suite.globalAddToExecString} {test.runtime_params}"
 
-        if args.with_valgrind:
-            base_cmd = "valgrind " + args.valgrind_options + " " + base_cmd
-
         if test.run_as_script:
             base_cmd = f"./{test.run_as_script} {test.script_args}"
 
         if test.customRunCmd is not None:
             base_cmd = test.customRunCmd
 
+        if args.with_valgrind:
+            base_cmd = "valgrind " + args.valgrind_options + " " + base_cmd
 
 
         suite.run_test(test, base_cmd)
@@ -729,6 +728,17 @@ def test_suite(argv):
 
                 base_cmd += f" {suite.globalAddToExecString} {test.runtime_params}"
 
+                if test.run_as_script:
+                    base_cmd = f"./{test.run_as_script} {test.script_args}"
+                    # base_cmd += " amr.restart={}".format(restart_file)
+
+                if test.customRunCmd is not None:
+                    base_cmd = test.customRunCmd
+                    base_cmd += " amr.restart={}".format(restart_file)
+
+                if args.with_valgrind:
+                    base_cmd = "valgrind " + args.valgrind_options + " " + base_cmd
+
             suite.run_test(test, base_cmd)
 
         test.wall_time = time.time() - test.wall_time