From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Nov 2012 18:24:13 +0000 (-0800)
Subject: Merge branch 'js/hp-nonstop'
X-Git-Tag: v1.8.1-rc0~64
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1f0335a63fede94308050a70a47ab7ee92c25d95?ds=sidebyside;hp=-c

Merge branch 'js/hp-nonstop'

Finishing touches to port to HP NonStop continues.

* js/hp-nonstop:
fix 'make test' for HP NonStop
---

1f0335a63fede94308050a70a47ab7ee92c25d95
diff --combined Makefile
index 53a766e283,1f81685f06..ea5c106bb2
--- a/Makefile
+++ b/Makefile
@@@ -495,7 -495,6 +495,7 @@@ PROGRAM_OBJS += sh-i18n--envsubst.
  PROGRAM_OBJS += shell.o
  PROGRAM_OBJS += show-index.o
  PROGRAM_OBJS += upload-pack.o
 +PROGRAM_OBJS += remote-testsvn.o
  
  # Binary suffix, set to .exe for Windows builds
  X =
@@@ -521,7 -520,6 +521,7 @@@ TEST_PROGRAMS_NEED_X += test-run-comman
  TEST_PROGRAMS_NEED_X += test-scrap-cache-tree
  TEST_PROGRAMS_NEED_X += test-sha1
  TEST_PROGRAMS_NEED_X += test-sigchain
 +TEST_PROGRAMS_NEED_X += test-string-list
  TEST_PROGRAMS_NEED_X += test-subprocess
  TEST_PROGRAMS_NEED_X += test-svn-fe
  
@@@ -746,7 -744,6 +746,7 @@@ LIB_OBJS += editor.
  LIB_OBJS += entry.o
  LIB_OBJS += environment.o
  LIB_OBJS += exec_cmd.o
 +LIB_OBJS += fetch-pack.o
  LIB_OBJS += fsck.o
  LIB_OBJS += gettext.o
  LIB_OBJS += gpg-interface.o
@@@ -764,7 -761,6 +764,7 @@@ LIB_OBJS += lockfile.
  LIB_OBJS += log-tree.o
  LIB_OBJS += mailmap.o
  LIB_OBJS += match-trees.o
 +LIB_OBJS += merge.o
  LIB_OBJS += merge-file.o
  LIB_OBJS += merge-recursive.o
  LIB_OBJS += mergesort.o
@@@ -799,7 -795,6 +799,7 @@@ LIB_OBJS += rerere.
  LIB_OBJS += resolve-undo.o
  LIB_OBJS += revision.o
  LIB_OBJS += run-command.o
 +LIB_OBJS += send-pack.o
  LIB_OBJS += sequencer.o
  LIB_OBJS += server-info.o
  LIB_OBJS += setup.o
@@@ -1385,6 -1380,10 +1385,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 = ;
@@@ -2453,10 -2452,6 +2457,10 @@@ git-http-push$X: revision.o http.o http
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
  		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
  
 +git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS) $(VCSSVN_LIB)
 +	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) \
 +	$(VCSSVN_LIB)
 +
  $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
  	$(QUIET_LNCP)$(RM) $@ && \
  	ln $< $@ 2>/dev/null || \
@@@ -2644,7 -2639,6 +2648,7 @@@ bin-wrappers/%: wrap-for-bin.s
  # with that.
  
  export NO_SVN_TESTS
 +export TEST_NO_MALLOC_CHECK
  
  ### Testing rules