ci: re-organize makefile

Makefile

@@ -2,9 +2,18 @@
 MK_FILE_PATH = $(lastword $(MAKEFILE_LIST))
 PRJ_DIR      = $(abspath $(dir $(MK_FILE_PATH)))
 GOPATH_LOCAL = $(PRJ_DIR)/build
-GOPATH_PKG   = src/github.com/cloudflare/p751sidh
+GOPATH_DIR   = github.com/cloudflare/p751sidh
 CSHAKE_PKG   = github.com/henrydcase/nobs/hash/sha3
 TARGETS      = p751toolbox sidh sike
+GOARCH       ?=
+OPTS_GCCGO   ?= -compiler gccgo -O2 -g
+OPTS_TAGS    ?= -tags=noasm
+OPTS         ?=
+NOASM        ?=
+
+ifeq ($(NOASM),1)
+	OPTS+=$(OPTS_TAGS)
+endif
 
 clean:
 	rm -rf $(GOPATH_LOCAL)
@@ -12,20 +21,24 @@ clean:
 
 prep:
 	GOPATH=$(GOPATH_LOCAL) go get $(CSHAKE_PKG)
-	mkdir -p $(GOPATH_LOCAL)/$(GOPATH_PKG)
-	cp -rf p751toolbox $(GOPATH_LOCAL)/$(GOPATH_PKG)
-	cp -rf sidh $(GOPATH_LOCAL)/$(GOPATH_PKG)
+	mkdir -p $(GOPATH_LOCAL)/src/$(GOPATH_DIR)
+	cp -rf p751toolbox $(GOPATH_LOCAL)/src/$(GOPATH_DIR)
+	cp -rf sidh $(GOPATH_LOCAL)/src/$(GOPATH_DIR)
+	cp -rf sike $(GOPATH_LOCAL)/src/$(GOPATH_DIR)
+	cp -rf etc $(GOPATH_LOCAL)/src/$(GOPATH_DIR)
 
-test-%: clean prep
-	GOPATH=$(GOPATH_LOCAL) go test -race -v ./$*
+test-%: prep
+	GOPATH=$(GOPATH_LOCAL) go test -v $(OPTS) $(GOPATH_DIR)/$*
 
 bench-%: prep
 	cd $*; GOPATH=$(GOPATH_LOCAL) go test -v $(OPTS) -bench=.
 
-cover-%: clean prep
-	GOPATH=$(GOPATH_LOCAL) go test -race -coverprofile=coverage_$*.txt -covermode=atomic ./$*
+cover-%: prep
+	GOPATH=$(GOPATH_LOCAL) go test \
+		-race -coverprofile=coverage_$*.txt -covermode=atomic $(OPTS) $(GOPATH_DIR)/$*
 	cat coverage_$*.txt >> coverage.txt
+	rm coverage_$*.txt
 
 test: $(addprefix test-, $(TARGETS))
 bench: $(addprefix bench-, $(TARGETS))
-cover: $(addprefix cover-, $(TARGETS))
+cover: $(addprefix cover-, $(TARGETS))

p751toolbox/curve_test.go

@@ -2,7 +2,6 @@ package p751toolbox
 
 import (
 	"bytes"
-	. "github.com/cloudflare/p751sidh/sidh"
 	"math/rand"
 	"reflect"
 	"testing"
@@ -218,8 +217,8 @@ func TestScalarMultVersusSage(t *testing.T) {
 
 func Test_jInvariant(t *testing.T) {
 	var curve = ProjectiveCurveParameters{A: curve_A, C: curve_C}
-	var jbufRes = make([]byte, Params(FP_751).SharedSecretSize)
-	var jbufExp = make([]byte, Params(FP_751).SharedSecretSize)
+	var jbufRes = make([]byte, P751_SharedSecretSize)
+	var jbufExp = make([]byte, P751_SharedSecretSize)
 	// Computed using Sage
 	// j = 3674553797500778604587777859668542828244523188705960771798425843588160903687122861541242595678107095655647237100722594066610650373491179241544334443939077738732728884873568393760629500307797547379838602108296735640313894560419*i + 3127495302417548295242630557836520229396092255080675419212556702820583041296798857582303163183558315662015469648040494128968509467224910895884358424271180055990446576645240058960358037224785786494172548090318531038910933793845
 	var known_j = ExtensionFieldElement{