diff options
Diffstat (limited to 'yarns/morph.shell-lib')
| -rw-r--r-- | yarns/morph.shell-lib | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/yarns/morph.shell-lib b/yarns/morph.shell-lib index 9c13e449..e7011091 100644 --- a/yarns/morph.shell-lib +++ b/yarns/morph.shell-lib @@ -3,7 +3,7 @@ # The shell functions in this library are meant to make writing IMPLEMENTS # sections for yarn scenario tests easier. -# Copyright (C) 2013-2014 Codethink Limited +# Copyright (C) 2013-2015 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,8 +15,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# with this program. If not, see <http://www.gnu.org/licenses/>. # Add $SRCDIR to PYTHONPATH. @@ -39,9 +38,13 @@ run_morph() set +e "$SRCDIR"/morph --verbose \ --cachedir-min-space=0 --tempdir-min-space=0 \ - --no-default-config --config "$DATADIR/morph.conf" "$@" \ - 2> "$DATADIR/result-$1" > "$DATADIR/out-$1" + --no-default-config --config "$DATADIR/morph.conf" \ + --log="$DATADIR/log-$1" \ + "$@" 2> "$DATADIR/result-$1" > "$DATADIR/out-$1" local exit_code="$?" + for o in log result out; do + ln -sf "$o-$1" "$DATADIR/$o-latest" + done cat "$DATADIR/out-$1" cat "$DATADIR/result-$1" >&2 return "$exit_code" |