Remove +build directive which is deprecated, remove tparse hadnling i…

…n Makefile.
cosmos · Sep 25, 2023 · c4d6fe8 · c4d6fe8
1 parent f18e65d
commit c4d6fe8
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 //go:build !test_e2e
-// +build !test_e2e
 
 package upgrades