Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix DHT tests failing because of repeated addresses #2855

Merged
merged 1 commit into from
Jun 15, 2016
+4 −4
Merged

Fix DHT tests failing because of repeated addresses #2855

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ IPFS_MIN_GX_VERSION = 0.6
IPFS_MIN_GX_GO_VERSION = 1.1

ifeq ($(TEST_NO_FUSE),1)
go_test=go test -tags nofuse
go_test=IPFS_REUSEPORT=false go test -tags nofuse
else
go_test=go test
go_test=IPFS_REUSEPORT=false go test
endif


Expand Down Expand Up @@ -92,10 +92,10 @@ test_go_race:
$(go_test) ./... -race

test_sharness_short:
cd test/sharness/ && make
make -C test/sharness/

test_sharness_expensive:
cd test/sharness/ && TEST_EXPENSIVE=1 make
TEST_EXPENSIVE=1 make -C test/sharness/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chriscool was there a reason to do the make after a cd? pls confirm this change is perfectly fine with you.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it's fine. One could also use make -C test/sharness/ TEST_EXPENSIVE=1. It's a matter of preference whether one wants the shell or make to do the cd and to set the environment variable.


test_all_commits:
@echo "testing all commits between origin/master..HEAD"
Expand Down