From fbf70e2e5595d0cc7edaf7240a732cc5d2632c34 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Wed, 12 Feb 2014 16:27:32 +0000 Subject: Warn and default to null if repo or ref are given This now means that the system morphology is not altered when chunks are altered, so some tests had to change. Since this uses the python warnings API, these warnings can be ignored by running python -W ignore:"stratum morphology" \ -W ignore:"system morphology" \ "$(which morph)" ...` or turned into errors with python -W error:"stratum morphology" \ -W error:"system morphology" \ "$(which morph)" ...` --- scripts/test-morph | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/test-morph b/scripts/test-morph index 46d87d9f..d8480d92 100755 --- a/scripts/test-morph +++ b/scripts/test-morph @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2012,2013 Codethink Limited +# Copyright (C) 2012,2014 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 @@ -27,10 +27,12 @@ set -eu # distributed builds, which invoke morph as a sub-process. export PATH="$SRCDIR:$PATH" +WARNING_IGNORES='-W ignore:(stratum|system)\s+morphology' if [ "$1" = "--find-system-artifact" ]; then shift - "$SRCDIR/morph" --no-default-config \ + python $WARNING_IGNORES \ + "$SRCDIR/morph" --no-default-config \ --tarball-server= --cache-server= \ --cachedir-min-space=0 --tempdir-min-space=0 \ --config="$DATADIR/morph.conf" --verbose "$@" > $DATADIR/stdout @@ -46,7 +48,9 @@ if [ "$1" = "--find-system-artifact" ]; then echo $ARTIFACT else - "$SRCDIR/scripts/cmd-filter" "$SRCDIR/morph" --no-default-config \ + "$SRCDIR/scripts/cmd-filter" \ + python $WARNING_IGNORES \ + "$SRCDIR/morph" --no-default-config \ --cachedir-min-space=0 --tempdir-min-space=0 \ --tarball-server= --cache-server= \ --config="$DATADIR/morph.conf" "$@" -- cgit v1.2.1