Mercurial > hg-stable
changeset 26168:b907051df5b7
test-merge-tools: include /usr/sbin in path for sysctl (issue4813)
/bin/sh expects to be able to reach sysctl via path (it lives in /usr/sbin)
| author | timeless@mozdev.org |
|---|---|
| date | Wed, 02 Sep 2015 16:56:04 -0400 |
| parents | 7187f6e923d5 |
| children | ea888285311f |
| files | tests/test-merge-tools.t |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge-tools.t Thu Sep 03 18:32:17 2015 -0500 +++ b/tests/test-merge-tools.t Wed Sep 02 16:56:04 2015 -0400 @@ -65,7 +65,7 @@ override $PATH to ensure hgmerge not visible; use $PYTHON in case we're running from a devel copy, not a temp installation - $ PATH="$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2 + $ PATH="$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 merging f warning: conflicts during merge. merging f incomplete! (edit conflicts, then use 'hg resolve --mark') @@ -111,7 +111,7 @@ $ echo "echo fail" > false $ hg up -qC 1 - $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2 + $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 merging f warning: conflicts during merge. merging f incomplete! (edit conflicts, then use 'hg resolve --mark') @@ -126,7 +126,7 @@ $ mkdir false $ hg up -qC 1 - $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2 + $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 merging f warning: conflicts during merge. merging f incomplete! (edit conflicts, then use 'hg resolve --mark')