Skip to content

Commit

Permalink
Maybe using sh directly will work
Browse files Browse the repository at this point in the history
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
  • Loading branch information
Kubuxu committed Dec 15, 2016
1 parent df41572 commit b051e28
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# General tools

SHELL=PATH=$(PATH) /bin/bash
SHELL=PATH=$(PATH) /bin/sh

PROTOC = protoc --gogo_out=. --proto_path=.:/usr/local/opt/protobuf/include:$(dir $@) $<

Expand Down
4 changes: 2 additions & 2 deletions coverage/Rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ endif

export IPFS_COVER_DIR:= $(realpath $(d))/sharnesscover/

$(d)/sharness_tests.coverprofile: $(d)/ipfs cmd/ipfs/ipfs-test-cover $(d)/coverage_deps test_sharness_short
(cd $(@D)/sharnesscover && gocovmerge * ) > $@
$(d)/sharness_tests.coverprofile:# $(d)/ipfs cmd/ipfs/ipfs-test-cover $(d)/coverage_deps test_sharness_short
(cd $(@D)/sharnesscover && sh -c 'gocovmerge *' ) > $@


PATH := $(realpath $(d)):$(PATH)
Expand Down

0 comments on commit b051e28

Please sign in to comment.