[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203
Stephane Popinet
popinet at users.sf.net
Fri May 15 02:54:25 UTC 2009
The following commit has been merged in the upstream branch:
commit f39c79334f8f424126941b6c16dbb213dbede9a1
Author: Stephane Popinet <popinet at users.sf.net>
Date: Tue Aug 7 15:03:38 2007 +1000
Testing framework now depends on bash
So that we can use the "set -o pipefail" option to be sure to capture all
errors when running a test command which is made of independent piped
commands (e.g. "gerris2D logo.gfs | gfsview2D logo.gfv").
darcs-hash:20070807050338-d4795-83b50731fc752be0d5dd5c4e99c2e68d64adb7a9.gz
diff --git a/doc/examples/gfs2tex.py b/doc/examples/gfs2tex.py
index efab920..a79e45d 100644
--- a/doc/examples/gfs2tex.py
+++ b/doc/examples/gfs2tex.py
@@ -191,7 +191,7 @@ class Example:
"else print $0;"
"}' < " + self.name + ".gfs > " + self.name + ".tmp && " +\
"mv -f " + self.name + ".tmp " + self.name + ".gfs && ( " +\
- command + " ) 2>&1")
+ "bash -c \" set -o pipefail && " + command + "\" ) 2>&1")
lines = out.readlines()
status = out.close()
os.system("rm -r -f " + wdname)
@@ -202,7 +202,7 @@ class Example:
def run(self,env=""):
out = os.popen("cd " + self.path + " && ( time -p " +\
- " sh -c \"" + env + " " + self.command + "\" ) 2>&1")
+ " bash -c \" set -o pipefail && " + env + " " + self.command + "\" ) 2>&1")
lines = []
for l in out:
record = l.split()
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list