prism-auto: Use -mainlog switch for redirecting output in test/log modes (mainly because this works better with Nailgun).

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10303 bbc10eb1-c90d-0410-af57-cb519fbb1720

prism/etc/scripts/prism-auto

@@ -321,13 +321,15 @@ def runPrism(args, dir=""):
     print ' '.join(prismArgs)
     if options.logDir:
         logFile = os.path.join(options.logDir, createLogFileName(args, dir))
-        f = open(logFile, 'w')
-        exitCode = subprocess.Popen(prismArgs, stdout=f).wait()
+        #f = open(logFile, 'w')
+        prismArgs = prismArgs + ['-mainlog', logFile]
+        exitCode = subprocess.Popen(prismArgs).wait()
         #exitCode = subprocess.Popen(prismArgs, cwd=dir, stdout=f).wait()
     elif options.test:
         f = tempfile.NamedTemporaryFile(delete=False)
         logFile = f.name
-        exitCode = subprocess.Popen(prismArgs, stdout=f).wait()
+        prismArgs = prismArgs + ['-mainlog', logFile]
+        exitCode = subprocess.Popen(prismArgs).wait()
     else:
         exitCode = subprocess.Popen(prismArgs).wait()
     # Extract test results if needed