Browse Source

Fix merge conflicts.

pull/8057/head
M. J. Fromberger 3 years ago
parent
commit
1551bb72e0
1 changed files with 0 additions and 5 deletions
  1. +0
    -5
      Makefile

+ 0
- 5
Makefile View File

@ -327,9 +327,4 @@ $(BUILDDIR)/packages.txt:$(GO_TEST_FILES) $(BUILDDIR)
split-test-packages:$(BUILDDIR)/packages.txt split-test-packages:$(BUILDDIR)/packages.txt
split -d -n l/$(NUM_SPLIT) $< $<. split -d -n l/$(NUM_SPLIT) $< $<.
test-group-%:split-test-packages test-group-%:split-test-packages
<<<<<<< HEAD
cat $(BUILDDIR)/packages.txt.$* | xargs go test -mod=readonly -timeout=15m -race -coverprofile=$(BUILDDIR)/$*.profile.out cat $(BUILDDIR)/packages.txt.$* | xargs go test -mod=readonly -timeout=15m -race -coverprofile=$(BUILDDIR)/$*.profile.out
=======
cat $(BUILDDIR)/packages.txt.$* | xargs go test -mod=readonly -timeout=5m -race -coverprofile=$(BUILDDIR)/$*.profile.out
>>>>>>> 59eaa4dba (Revert "Remove master from versions and copy it from the latest. (#7980)" (#8053))

Loading…
Cancel
Save