[FAB-11064] Run metalinters once

Change-Id: I65c8b7ecbc54b24817115c29ca355bb6eeedb4e5
Signed-off-by: Troy Ronda <troy@troyronda.com>

Author: troyronda

Makefile

@@ -210,10 +210,6 @@ license:
 lint: populate
 	@LINT_CHANGED_ONLY=true $(TEST_SCRIPTS_PATH)/check_lint.sh
 
-.PHONY: lint-integration-tests
-lint-integration-tests: populate
-	@LINT_CHANGED_ONLY=true $(TEST_SCRIPTS_PATH)/check_lint_tests.sh
-
 .PHONY: lint-all
 lint-all: populate
 	@$(TEST_SCRIPTS_PATH)/check_lint.sh
@@ -226,7 +222,7 @@ build-softhsm2-image:
 		-f $(FIXTURE_SOFTHSM2_PATH)/Dockerfile .
 
 .PHONY: unit-test
-unit-test: license depend populate lint-integration-tests
+unit-test: license depend populate
 	@TEST_CHANGED_ONLY=true TEST_WITH_LINTER=true FABRIC_SDKGO_CODELEVEL=$(FABRIC_CODELEVEL_UNITTEST_TAG) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_CODELEVEL_UNITTEST_VER) $(TEST_SCRIPTS_PATH)/unit.sh
 ifeq ($(FABRIC_SDK_DEPRECATED_UNITTEST),true)
 	@GO_TAGS="$(GO_TAGS) deprecated" TEST_CHANGED_ONLY=true FABRIC_SDKGO_CODELEVEL=$(FABRIC_CODELEVEL_UNITTEST_TAG) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_CODELEVEL_UNITTEST_VER) $(TEST_SCRIPTS_PATH)/unit.sh

test/scripts/check_lint_tests.sh

@@ -75,6 +75,7 @@ if [ "${TEST_WITH_LINTER}" = true ]; then
     runLinter
 fi
 
+echo "Code level $FABRIC_SDKGO_CODELEVEL_TAG (Fabric ${FABRIC_SDKGO_CODELEVEL_VER})"
 echo "Running PKCS11 unit tests (libltdl and softhsm required)..."
 
 # detect softhsm
@@ -85,7 +86,6 @@ if [ "$SOFTHSM" == "" ]; then
     exit 1
 fi
 
-echo "Testing with code level $FABRIC_SDKGO_CODELEVEL_TAG (Fabric ${FABRIC_SDKGO_CODELEVEL_VER}) ..."
 GO_TAGS="$GO_TAGS $FABRIC_SDKGO_CODELEVEL_TAG"
 
 GO_LDFLAGS="$GO_LDFLAGS -X github.com/hyperledger/fabric-sdk-go/test/metadata.ChannelConfigPath=test/fixtures/fabric/${FABRIC_SDKGO_CODELEVEL_VER}/channel -X github.com/hyperledger/fabric-sdk-go/test/metadata.CryptoConfigPath=test/fixtures/fabric/${FABRIC_CRYPTOCONFIG_VERSION}/crypto-config"

test/scripts/unit-pkcs11.sh

@@ -34,8 +34,9 @@ echo "Running" $(basename "$0")
 # Find all packages that should be tested.
 declare -a PKG_SRC=(
     "./pkg"
+    "./test"
 )
-declare PKG_EXCLUDE="(${REPO}/pkg/core/cryptosuite/bccsp/multisuite|${REPO}/pkg/core/cryptosuite/bccsp/pkcs11)"
+declare PKG_EXCLUDE=""
 findPackages
 
 # Reduce unit tests to changed packages.
@@ -73,8 +74,15 @@ if [ "${TEST_WITH_LINTER}" = true ]; then
     runLinter
 fi
 
+# filter out excluded tests
+PKGS=($(echo "${PKGS[@]}" | tr ' ' '\n' | \
+    grep -v ^${REPO}/test | \
+    grep -v ^${REPO}/pkg/core/cryptosuite/bccsp/multisuite | \
+    grep -v ^${REPO}/pkg/core/cryptosuite/bccsp/pkcs11 | \
+    tr ' ' '\n'))
+
+echo "Code level $FABRIC_SDKGO_CODELEVEL_TAG (Fabric ${FABRIC_SDKGO_CODELEVEL_VER})"
 echo "Running unit tests..."
-echo "Testing with code level $FABRIC_SDKGO_CODELEVEL_TAG (Fabric ${FABRIC_SDKGO_CODELEVEL_VER}) ..."
 GO_TAGS="$GO_TAGS $FABRIC_SDKGO_CODELEVEL_TAG"
 
 GO_LDFLAGS="$GO_LDFLAGS -X github.com/hyperledger/fabric-sdk-go/test/metadata.ChannelConfigPath=test/fixtures/fabric/${FABRIC_SDKGO_CODELEVEL_VER}/channel -X github.com/hyperledger/fabric-sdk-go/test/metadata.CryptoConfigPath=test/fixtures/fabric/${FABRIC_CRYPTOCONFIG_VERSION}/crypto-config"