multi: support optional itest cases

In this commit, we add additional make commands to run optional itests,
where specific test cases are still specified with the 'icase' variable.
Additional optional itests are added in the same way as default itests.
We also remove the old-style build tags that were replaced with Go 1.17.

Makefile

@@ -179,6 +179,20 @@ itest-only-trace: aperture-dir
 	rm -rf itest/regtest; date
 	$(GOTEST) ./itest -v -tags="$(ITEST_TAGS)" $(TEST_FLAGS) $(ITEST_FLAGS) -loglevel=trace -btcdexec=./btcd-itest -logdir=regtest
 
+optional-itest: build-itest optional-itest-only
+
+optional-itest-trace: build-itest optional-itest-only-trace
+
+optional-itest-only: aperture-dir
+	@$(call print, "Running integration tests with ${backend} backend.")
+	rm -rf itest/regtest; date
+	$(GOTEST) ./itest -v -tags="$(ITEST_TAGS)" $(TEST_FLAGS) $(ITEST_FLAGS) -optional -btcdexec=./btcd-itest -logdir=regtest
+
+optional-itest-only-trace: aperture-dir
+	@$(call print, "Running integration tests with ${backend} backend.")
+	rm -rf itest/regtest; date
+	$(GOTEST) ./itest -v -tags="$(ITEST_TAGS)" $(TEST_FLAGS) $(ITEST_FLAGS) -optional -loglevel=trace -btcdexec=./btcd-itest -logdir=regtest
+
 aperture-dir:
 ifeq ($(UNAME_S),Linux)
 	mkdir -p $$HOME/.aperture

itest/integration_test.go

@@ -1,10 +1,10 @@
 //go:build itest
-// +build itest
 
 package itest
 
 import (
 	"context"
+	"flag"
 	"fmt"
 	"testing"
 	"time"
@@ -14,12 +14,21 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+var optionalTests = flag.Bool("optional", false, "if true, the optional test"+
+	"list will be used")
+
 // TestTaprootAssetsDaemon performs a series of integration tests amongst a
 // programmatically driven set of participants, namely a Taproot Assets daemon
 // and a universe server.
 func TestTaprootAssetsDaemon(t *testing.T) {
+	// Switch to the list of optional test cases with the '-optional' flag.
+	testList := testCases
+	if *optionalTests {
+		testList = optionalTestCases
+	}
+
 	// If no tests are registered, then we can exit early.
-	if len(testCases) == 0 {
+	if len(testList) == 0 {
 		t.Skip("integration tests not selected with flag 'itest'")
 	}
 
@@ -41,8 +50,8 @@ func TestTaprootAssetsDaemon(t *testing.T) {
 
 	lndHarness.SetupStandbyNodes()
 
-	t.Logf("Running %v integration tests", len(testCases))
-	for _, testCase := range testCases {
+	t.Logf("Running %v integration tests", len(testList))
+	for _, testCase := range testList {
 		logLine := fmt.Sprintf("STARTING ============ %v ============\n",
 			testCase.name)
 

itest/test_list_on_test.go

@@ -1,5 +1,4 @@
 //go:build itest
-// +build itest
 
 package itest
 
@@ -129,3 +128,10 @@ var testCases = []*testCase{
 		test: testGetInfo,
 	},
 }
+
+var optionalTestCases = []*testCase{
+	{
+		name: "get info",
+		test: testGetInfo,
+	},
+}

mssmt/bench_test.go

@@ -1,5 +1,4 @@
 //go:build !race
-// +build !race
 
 package mssmt_test
 

mssmt/tree_test.go

@@ -1,5 +1,4 @@
 //go:build !race
-// +build !race
 
 package mssmt_test
 

tapdb/test_postgres.go

@@ -1,5 +1,4 @@
 //go:build test_db_postgres
-// +build test_db_postgres
 
 package tapdb
 

tapdb/test_sqlite.go

@@ -1,5 +1,4 @@
 //go:build !test_db_postgres
-// +build !test_db_postgres
 
 package tapdb
 

tools/tools.go

@@ -1,5 +1,4 @@
 //go:build tools
-// +build tools
 
 package tapd