test-all should not rerun test-fast (#2478)

This commit is contained in:
CyrusNajmabadi 2019-02-25 13:01:52 -08:00 committed by GitHub
parent dfdcba2ea7
commit 9225c0d72d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

@ -32,10 +32,10 @@ lint::
golangci-lint run
test_fast::
go test -timeout $(TEST_FAST_TIMEOUT) -count=1 -parallel ${TESTPARALLELISM} ${PROJECT_PKGS}
PATH=$(PULUMI_ROOT)/bin:$(PATH) go test -short -timeout $(TEST_FAST_TIMEOUT) -count=1 -parallel ${TESTPARALLELISM} ${PROJECT_PKGS}
test_all::
PATH=$(PULUMI_ROOT)/bin:$(PATH) go test -count=1 -parallel ${TESTPARALLELISM} ${EXTRA_TEST_PKGS}
PATH=$(PULUMI_ROOT)/bin:$(PATH) go test -count=1 -parallel ${TESTPARALLELISM} ${PROJECT_PKGS} ${EXTRA_TEST_PKGS}
.PHONY: publish_tgz
publish_tgz:

View file

@ -104,7 +104,7 @@ endif
PULUMI_BIN := $(PULUMI_ROOT)/bin
PULUMI_NODE_MODULES := $(PULUMI_ROOT)/node_modules
.PHONY: default all ensure only_build only_test build lint install test_fast test_all core
.PHONY: default all ensure only_build only_test build lint install test_all core
# ensure that `default` is the target that is run when no arguments are passed to make
default::
@ -161,7 +161,7 @@ install::
dist::
$(call STEP_MESSAGE)
test_all:: test_fast
test_all::
$(call STEP_MESSAGE)
ifneq ($(NODE_MODULE_NAME),)