test: fix windows build

Consensys · Oct 7, 2024 · 40622b0 · 40622b0
1 parent e26bbdf
commit 40622b0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/field/generator/generator_test.go b/field/generator/generator_test.go
@@ -32,10 +32,11 @@ import (
 // integration test will create modulus for various field sizes and run tests
 
 const rootDir = "integration_test"
-const asmDir = "../asm"
 
 func TestIntegration(t *testing.T) {
 	assert := require.New(t)
+	asmDir := filepath.Join("..", "asm")
+	asmDirIncludePath := filepath.Join("..", "..", "..", "asm")
 
 	os.RemoveAll(rootDir)
 	err := os.MkdirAll(rootDir, 0700)
@@ -89,7 +90,7 @@ func TestIntegration(t *testing.T) {
 		childDir := filepath.Join(rootDir, elementName)
 		fIntegration, err = field.NewFieldConfig("integration", elementName, modulus, false)
 		assert.NoError(err)
-		assert.NoError(GenerateFF(fIntegration, childDir, asmDir, "../../../asm"))
+		assert.NoError(GenerateFF(fIntegration, childDir, asmDir, asmDirIncludePath))
 	}
 
 	// run go test

diff --git a/field/goff/cmd/root.go b/field/goff/cmd/root.go
@@ -78,7 +78,7 @@ func cmdGenerate(cmd *cobra.Command, args []string) {
 		os.Exit(-1)
 	}
 
-	if err := generator.GenerateFF(F, fOutputDir, asmDir, "asm/"); err != nil {
+	if err := generator.GenerateFF(F, fOutputDir, asmDir, "asm"); err != nil {
 		fmt.Printf("\n%s\n", err.Error())
 		os.Exit(-1)
 	}

diff --git a/field/goldilocks/internal/main.go b/field/goldilocks/internal/main.go
@@ -14,7 +14,7 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	if err := generator.GenerateFF(goldilocks, "../", "", ""); err != nil {
+	if err := generator.GenerateFF(goldilocks, "..", "", ""); err != nil {
 		panic(err)
 	}
 	fmt.Println("successfully generated goldilocks field")

diff --git a/internal/generator/main.go b/internal/generator/main.go
@@ -36,18 +36,18 @@ import (
 const (
 	copyrightHolder = "Consensys Software Inc."
 	copyrightYear   = 2020
-	baseDir         = "../../"
 )
 
 var bgen = bavard.NewBatchGenerator(copyrightHolder, copyrightYear, "consensys/gnark-crypto")
 
 //go:generate go run main.go
 func main() {
 
+	baseDir := filepath.Join("..", "..")
 	// first we loop through the field arithmetic we must generate.
 	// then, we create the common files (only once) for the assembly code.
 	asmDirBuildPath := filepath.Join(baseDir, "field", "asm")
-	asmDirIncludePath := filepath.Join("../../../", "field", "asm")
+	asmDirIncludePath := filepath.Join(baseDir, "..", "field", "asm")
 
 	// generate common assembly files depending on field number of words
 	mCommon := make(map[int]bool)