Merge pull request #104 from ax3l/fix-restartCustomRunCmd

Fix: restart test with custom run cmd

Author: zingale

regtest.py

@@ -670,15 +670,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)
@@ -730,6 +729,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