From c4d6fe8e8bc7fc29179dd8cdb67ce7fb6a670d52 Mon Sep 17 00:00:00 2001 From: DimitrisJim Date: Thu, 21 Sep 2023 16:18:34 +0300 Subject: [PATCH] Remove +build directive which is deprecated, remove tparse hadnling in Makefile. --- Makefile | 13 ------------- e2e/tests/core/02-client/client_test.go | 1 - e2e/tests/core/03-connection/connection_test.go | 1 - e2e/tests/interchain_accounts/base_test.go | 1 - e2e/tests/interchain_accounts/gov_test.go | 1 - e2e/tests/interchain_accounts/groups_test.go | 1 - e2e/tests/interchain_accounts/incentivized_test.go | 1 - e2e/tests/interchain_accounts/localhost_test.go | 1 - e2e/tests/interchain_accounts/params_test.go | 1 - e2e/tests/transfer/authz_test.go | 1 - e2e/tests/transfer/base_test.go | 1 - e2e/tests/transfer/incentivized_test.go | 1 - e2e/tests/transfer/localhost_test.go | 1 - e2e/tests/upgrades/genesis_test.go | 2 ++ e2e/tests/upgrades/upgrade_test.go | 1 - 15 files changed, 2 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index bd8d9f54df3..020eb1fe065 100644 --- a/Makefile +++ b/Makefile @@ -196,18 +196,6 @@ ARGS += -tags "$(test_tags)" SUB_MODULES = $(shell find . -type f -name 'go.mod' -print0 | xargs -0 -n1 dirname | sort) CURRENT_DIR = $(shell pwd) run-tests: -ifneq (,$(shell which tparse 2>/dev/null)) - @echo "Starting unit tests"; \ - finalec=0; \ - for module in $(SUB_MODULES); do \ - cd ${CURRENT_DIR}/$$module; \ - echo "Running unit tests for $$(grep '^module' go.mod)"; \ - go test -mod=readonly -json $(ARGS) $(EXTRA_ARGS) $(TEST_PACKAGES) ./... | tparse; \ - ec=$$?; \ - if [ "$$ec" -ne '0' ]; then finalec=$$ec; fi; \ - done; \ - exit $$finalec -else @echo "Starting unit tests"; \ finalec=0; \ for module in $(SUB_MODULES); do \ @@ -218,7 +206,6 @@ else if [ "$$ec" -ne '0' ]; then finalec=$$ec; fi; \ done; \ exit $$finalec -endif .PHONY: run-tests test test-all $(TEST_TARGETS) diff --git a/e2e/tests/core/02-client/client_test.go b/e2e/tests/core/02-client/client_test.go index 9bdf6ea9937..383ebb9300e 100644 --- a/e2e/tests/core/02-client/client_test.go +++ b/e2e/tests/core/02-client/client_test.go @@ -1,5 +1,4 @@ //go:build !test_e2e -// +build !test_e2e package client diff --git a/e2e/tests/core/03-connection/connection_test.go b/e2e/tests/core/03-connection/connection_test.go index 533130af301..91e33d3fb07 100644 --- a/e2e/tests/core/03-connection/connection_test.go +++ b/e2e/tests/core/03-connection/connection_test.go @@ -1,5 +1,4 @@ //go:build !test_e2e -// +build !test_e2e package connection diff --git a/e2e/tests/interchain_accounts/base_test.go b/e2e/tests/interchain_accounts/base_test.go index c0671e06b00..d2e693da9a5 100644 --- a/e2e/tests/interchain_accounts/base_test.go +++ b/e2e/tests/interchain_accounts/base_test.go @@ -1,5 +1,4 @@ //go:build !test_e2e -// +build !test_e2e package interchainaccounts diff --git a/e2e/tests/interchain_accounts/gov_test.go b/e2e/tests/interchain_accounts/gov_test.go index 84ef7326604..75286f21d3d 100644 --- a/e2e/tests/interchain_accounts/gov_test.go +++ b/e2e/tests/interchain_accounts/gov_test.go @@ -1,5 +1,4 @@ //go:build !test_e2e -// +build !test_e2e package interchainaccounts diff --git a/e2e/tests/interchain_accounts/groups_test.go b/e2e/tests/interchain_accounts/groups_test.go index a12e9e5b23d..acf82702d5f 100644 --- a/e2e/tests/interchain_accounts/groups_test.go +++ b/e2e/tests/interchain_accounts/groups_test.go @@ -1,5 +1,4 @@ //go:build !test_e2e -// +build !test_e2e package interchainaccounts diff --git a/e2e/tests/interchain_accounts/incentivized_test.go b/e2e/tests/interchain_accounts/incentivized_test.go index e32c029a4d8..4181029d489 100644 --- a/e2e/tests/interchain_accounts/incentivized_test.go +++ b/e2e/tests/interchain_accounts/incentivized_test.go @@ -1,5 +1,4 @@ //go:build !test_e2e -// +build !test_e2e package interchainaccounts diff --git a/e2e/tests/interchain_accounts/localhost_test.go b/e2e/tests/interchain_accounts/localhost_test.go index f5e446db0ba..7ea4ccb55d2 100644 --- a/e2e/tests/interchain_accounts/localhost_test.go +++ b/e2e/tests/interchain_accounts/localhost_test.go @@ -1,5 +1,4 @@ //go:build !test_e2e -// +build !test_e2e package interchainaccounts diff --git a/e2e/tests/interchain_accounts/params_test.go b/e2e/tests/interchain_accounts/params_test.go index 3a7304b4109..5e2540c2ede 100644 --- a/e2e/tests/interchain_accounts/params_test.go +++ b/e2e/tests/interchain_accounts/params_test.go @@ -1,5 +1,4 @@ //go:build !test_e2e -// +build !test_e2e package interchainaccounts diff --git a/e2e/tests/transfer/authz_test.go b/e2e/tests/transfer/authz_test.go index cddeb479874..f9af5f15468 100644 --- a/e2e/tests/transfer/authz_test.go +++ b/e2e/tests/transfer/authz_test.go @@ -1,5 +1,4 @@ //go:build !test_e2e -// +build !test_e2e package transfer diff --git a/e2e/tests/transfer/base_test.go b/e2e/tests/transfer/base_test.go index 3b44e3eb05c..8310e75d0ac 100644 --- a/e2e/tests/transfer/base_test.go +++ b/e2e/tests/transfer/base_test.go @@ -1,5 +1,4 @@ //go:build !test_e2e -// +build !test_e2e package transfer diff --git a/e2e/tests/transfer/incentivized_test.go b/e2e/tests/transfer/incentivized_test.go index 552d657b10c..92a8109924a 100644 --- a/e2e/tests/transfer/incentivized_test.go +++ b/e2e/tests/transfer/incentivized_test.go @@ -1,5 +1,4 @@ //go:build !test_e2e -// +build !test_e2e package transfer diff --git a/e2e/tests/transfer/localhost_test.go b/e2e/tests/transfer/localhost_test.go index 4815a5189ba..1182429abc4 100644 --- a/e2e/tests/transfer/localhost_test.go +++ b/e2e/tests/transfer/localhost_test.go @@ -1,5 +1,4 @@ //go:build !test_e2e -// +build !test_e2e package transfer diff --git a/e2e/tests/upgrades/genesis_test.go b/e2e/tests/upgrades/genesis_test.go index 9d1d367d4c0..087540e9b8d 100644 --- a/e2e/tests/upgrades/genesis_test.go +++ b/e2e/tests/upgrades/genesis_test.go @@ -1,3 +1,5 @@ +//go:build !test_e2e + package upgrades import ( diff --git a/e2e/tests/upgrades/upgrade_test.go b/e2e/tests/upgrades/upgrade_test.go index 2f7ae4f6854..76530d00520 100644 --- a/e2e/tests/upgrades/upgrade_test.go +++ b/e2e/tests/upgrades/upgrade_test.go @@ -1,5 +1,4 @@ //go:build !test_e2e -// +build !test_e2e package upgrades