| Submitter | timeless@mozdev.org |
|---|---|
| Date | Sept. 2, 2015, 8:59 p.m. |
| Message ID | <c8716f45c96bacfdc963.1441227594@waste.org> |
| Download | mbox | patch |
| Permalink | /patch/10373/ |
| State | Accepted |
| Headers | show |
Comments
On Wed, Sep 02, 2015 at 03:59:54PM -0500, timeless@mozdev.org wrote: > # HG changeset patch > # User timeless@mozdev.org > # Date 1441227364 14400 > # Wed Sep 02 16:56:04 2015 -0400 > # Node ID c8716f45c96bacfdc963d71e492c68b6b5ff8594 > # Parent f77a3f27cea533232dc107a72773e90e2de9549d > test-merge-tools: include /usr/sbin in path for sysctl (issue4813) queued this, thanks > > /bin/sh expects to be able to reach sysctl via path (it lives in /usr/sbin) > > diff --git a/tests/test-merge-tools.t b/tests/test-merge-tools.t > --- a/tests/test-merge-tools.t > +++ b/tests/test-merge-tools.t > @@ -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') > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > https://selenic.com/mailman/listinfo/mercurial-devel
Patch
diff --git a/tests/test-merge-tools.t b/tests/test-merge-tools.t --- a/tests/test-merge-tools.t +++ b/tests/test-merge-tools.t @@ -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')