Regression test suite: update run.

2016-04-20 00:04:26 +02:00
parent 3659570292 fe60654c1a
commit c122bb2def
1 changed files with 4 additions and 0 deletions
--- a/test/regression/run.py
+++ b/test/regression/run.py
@@ -223,7 +223,11 @@ def process_dir(d, outfile_results, zipin, result ):
                "dump",
                fullpath, outfile_actual, "-b", "-s", "-l" ] +\
                pppreset.split()
+<<<<<<< HEAD
            print( "command = " + str( command ) )
+=======
+            print "command = " + command )
+>>>>>>> fe60654c1ad4d665e2fed05b257a06815c7c113f
            r = subprocess.call(command, **shellparams)
            outfile_results.flush()