Merge "[FAB-3060] skip java chaincode tests on non-x86_84"

hyperledger · Apr 11, 2017 · e77644d · e77644d
2 parents a076bba + dc143e2
commit e77644d
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/core/chaincode/exectransaction_test.go b/core/chaincode/exectransaction_test.go
@@ -23,6 +23,7 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"sync"
@@ -643,6 +644,10 @@ func TestExecuteInvokeTransaction(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.chaincodeType.String(), func(t *testing.T) {
 
+			if tc.chaincodeType == pb.ChaincodeSpec_JAVA && runtime.GOARCH != "amd64" {
+				t.Skip("No Java chaincode support yet on non-x86_64.")
+			}
+
 			chainID := util.GetTestChainID()
 
 			lis, err := initPeer(chainID)
@@ -1549,6 +1554,10 @@ func TestChaincodeInitializeInitError(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name+"_"+tc.chaincodeType.String(), func(t *testing.T) {
 
+			if tc.chaincodeType == pb.ChaincodeSpec_JAVA && runtime.GOARCH != "amd64" {
+				t.Skip("No Java chaincode support yet on non-x86_64.")
+			}
+
 			// initialize peer
 			if listener, err := initPeer(channelID); err != nil {
 				t.Errorf("Error creating peer: %s", err)