Skip to content

Commit

Permalink
Merge pull request #5786 from planetscale/ds-makefile-tests
Browse files Browse the repository at this point in the history
Fix test and unit_test targets
  • Loading branch information
morgo authored Feb 4, 2020
2 parents 6a71f24 + 8b80140 commit 157f952
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@ jobs:
- name: unit
run: |
eatmydata -- make test
eatmydata -- make unit_test
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,8 @@ visitor:
# To pass extra flags, run test.go manually.
# For example: go run test.go -docker=false -- --extra-flag
# For more info see: go run test.go -help
test: build dependency_check
echo $$(date): Running unit tests
tools/unit_test_runner.sh
test:
go run test.go -docker=false

site_test: unit_test site_integration_test

Expand All @@ -112,6 +111,10 @@ cleanall: clean
# Remind people to run bootstrap.sh again
echo "Please run 'make tools' again to setup your environment"

unit_test: build dependency_check
echo $$(date): Running unit tests
tools/unit_test_runner.sh

e2e_test: build
echo $$(date): Running endtoend tests
go test $(VT_GO_PARALLEL) ./go/.../endtoend/...
Expand Down

0 comments on commit 157f952

Please sign in to comment.