* RE: [PATCH v2] fix 'make test' for HP NonStop @ 2012-10-25 10:57 Joachim Schmitz 2012-10-29 7:06 ` Jeff King 0 siblings, 1 reply; 4+ messages in thread From: Joachim Schmitz @ 2012-10-25 10:57 UTC (permalink / raw) To: 'Jeff King'; +Cc: git This fixes the vast majority of test failures on HP NonStop. Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de> --- v2: hardcode /usr/local rather than using ${prefix} Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index f69979e..35380dd 100644 --- a/Makefile +++ b/Makefile @@ -1381,6 +1381,15 @@ ifeq ($(uname_S),NONSTOP_KERNEL) MKDIR_WO_TRAILING_SLASH = YesPlease # RFE 10-120912-4693 submitted to HP NonStop development. NO_SETITIMER = UnfortunatelyYes + + # for 'make test' + # some test don't work with /bin/diff, some fail with /bin/tar + # some need bash, and some need /usr/local/bin in PATH first + SHELL_PATH=/usr/local/bin/bash + SANE_TOOL_PATH=/usr/local/bin + # as of H06.25/J06.14, we might better use this + #SHELL_PATH=/usr/coreutils/bin/bash + #SANE_TOOL_PATH=/usr/coreutils/bin:/usr/local/bin endif ifneq (,$(findstring MINGW,$(uname_S))) pathsep = ; ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] fix 'make test' for HP NonStop 2012-10-25 10:57 [PATCH v2] fix 'make test' for HP NonStop Joachim Schmitz @ 2012-10-29 7:06 ` Jeff King 2012-10-30 9:21 ` Joachim Schmitz 0 siblings, 1 reply; 4+ messages in thread From: Jeff King @ 2012-10-29 7:06 UTC (permalink / raw) To: Joachim Schmitz; +Cc: git On Thu, Oct 25, 2012 at 12:57:10PM +0200, Joachim Schmitz wrote: > diff --git a/Makefile b/Makefile > index f69979e..35380dd 100644 > --- a/Makefile > +++ b/Makefile > @@ -1381,6 +1381,15 @@ ifeq ($(uname_S),NONSTOP_KERNEL) > MKDIR_WO_TRAILING_SLASH = YesPlease > # RFE 10-120912-4693 submitted to HP NonStop development. > NO_SETITIMER = UnfortunatelyYes > + > + # for 'make test' > + # some test don't work with /bin/diff, some fail with /bin/tar > + # some need bash, and some need /usr/local/bin in PATH first > + SHELL_PATH=/usr/local/bin/bash > + SANE_TOOL_PATH=/usr/local/bin I think we can drop these comments, as the reasoning really should just go in the commit message. > + # as of H06.25/J06.14, we might better use this > + #SHELL_PATH=/usr/coreutils/bin/bash > + #SANE_TOOL_PATH=/usr/coreutils/bin:/usr/local/bin Is there any reason not to put both into the default SANE_TOOL_PATH? If /usr/coreutils/bin does not exist on older versions, it will be a harmless no-op. I guess we arestuck with picking one $SHELL_PATH, though. -Peff ^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH v2] fix 'make test' for HP NonStop 2012-10-29 7:06 ` Jeff King @ 2012-10-30 9:21 ` Joachim Schmitz 2012-10-30 11:13 ` Jeff King 0 siblings, 1 reply; 4+ messages in thread From: Joachim Schmitz @ 2012-10-30 9:21 UTC (permalink / raw) To: 'Jeff King'; +Cc: git > From: Jeff King [mailto:peff@peff.net] > Sent: Monday, October 29, 2012 8:07 AM > To: Joachim Schmitz > Cc: git@vger.kernel.org > Subject: Re: [PATCH v2] fix 'make test' for HP NonStop > > On Thu, Oct 25, 2012 at 12:57:10PM +0200, Joachim Schmitz wrote: > > > diff --git a/Makefile b/Makefile > > index f69979e..35380dd 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -1381,6 +1381,15 @@ ifeq ($(uname_S),NONSTOP_KERNEL) > > MKDIR_WO_TRAILING_SLASH = YesPlease > > # RFE 10-120912-4693 submitted to HP NonStop development. > > NO_SETITIMER = UnfortunatelyYes > > + > > + # for 'make test' > > + # some test don't work with /bin/diff, some fail with /bin/tar > > + # some need bash, and some need /usr/local/bin in PATH first > > + SHELL_PATH=/usr/local/bin/bash > > + SANE_TOOL_PATH=/usr/local/bin > > I think we can drop these comments, as the reasoning really should just > go in the commit message. OK by me. > > + # as of H06.25/J06.14, we might better use this > > + #SHELL_PATH=/usr/coreutils/bin/bash > > + #SANE_TOOL_PATH=/usr/coreutils/bin:/usr/local/bin > > Is there any reason not to put both into the default SANE_TOOL_PATH? If > /usr/coreutils/bin does not exist on older versions, it will be a > harmless no-op. I guess we arestuck with picking one $SHELL_PATH, > though. And because of that have to modify something anyway... But I don't really mind about an extended SANE_TOOL_PATH > -Peff Bye, Jojo -- 8< -- This fixes the vast majority of test failures on HP NonStop. Some test don't work with /bin/diff, some fail with /bin/tar, so let's put /usr/local/bin in PATH first. Some tests fail with /bin/sh (link to /bin/ksh) so use bash instead Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de> --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index f69979e..35380dd 100644 --- a/Makefile +++ b/Makefile @@ -1381,6 +1381,10 @@ ifeq ($(uname_S),NONSTOP_KERNEL) MKDIR_WO_TRAILING_SLASH = YesPlease # RFE 10-120912-4693 submitted to HP NonStop development. NO_SETITIMER = UnfortunatelyYes + SANE_TOOL_PATH=/usr/coreutils/bin:/usr/local/bin + SHELL_PATH=/usr/local/bin/bash + # as of H06.25/J06.14, we might better use this + #SHELL_PATH=/usr/coreutils/bin/bash endif ifneq (,$(findstring MINGW,$(uname_S))) pathsep = ; ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] fix 'make test' for HP NonStop 2012-10-30 9:21 ` Joachim Schmitz @ 2012-10-30 11:13 ` Jeff King 0 siblings, 0 replies; 4+ messages in thread From: Jeff King @ 2012-10-30 11:13 UTC (permalink / raw) To: Joachim Schmitz; +Cc: git On Tue, Oct 30, 2012 at 10:21:40AM +0100, Joachim Schmitz wrote: > This fixes the vast majority of test failures on HP NonStop. > Some test don't work with /bin/diff, some fail with /bin/tar, > so let's put /usr/local/bin in PATH first. > Some tests fail with /bin/sh (link to /bin/ksh) so use bash instead > > Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de> > --- > > Makefile | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/Makefile b/Makefile > index f69979e..35380dd 100644 > --- a/Makefile > +++ b/Makefile > @@ -1381,6 +1381,10 @@ ifeq ($(uname_S),NONSTOP_KERNEL) > MKDIR_WO_TRAILING_SLASH = YesPlease > # RFE 10-120912-4693 submitted to HP NonStop development. > NO_SETITIMER = UnfortunatelyYes > + SANE_TOOL_PATH=/usr/coreutils/bin:/usr/local/bin > + SHELL_PATH=/usr/local/bin/bash > + # as of H06.25/J06.14, we might better use this > + #SHELL_PATH=/usr/coreutils/bin/bash > endif > ifneq (,$(findstring MINGW,$(uname_S))) > pathsep = ; Your patch was whitespace damaged, but I was able to fix it up. Thanks. -Peff ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-10-30 11:13 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-10-25 10:57 [PATCH v2] fix 'make test' for HP NonStop Joachim Schmitz 2012-10-29 7:06 ` Jeff King 2012-10-30 9:21 ` Joachim Schmitz 2012-10-30 11:13 ` Jeff King
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).