change make file a fixe other tests

gnolang · Oct 23, 2024 · 53369df · 53369df
1 parent 81e2d03
commit 53369df
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 6 deletions.
diff --git a/examples/gno.land/r/demo/disperse/z_0_filetest.gno b/examples/gno.land/r/demo/disperse/z_0_filetest.gno
@@ -1,3 +1,5 @@
+// PKGPATH: gno.land/r/demo/main
+
 // SEND: 200ugnot
 
 package main
@@ -10,7 +12,7 @@ import (
 
 func main() {
 	disperseAddr := std.DerivePkgAddr("gno.land/r/demo/disperse")
-	mainaddr := std.DerivePkgAddr("main")
+	mainaddr := std.DerivePkgAddr("gno.land/r/demo/main")
 
 	std.TestSetOrigPkgAddr(disperseAddr)
 	std.TestSetOrigCaller(mainaddr)

diff --git a/examples/gno.land/r/demo/disperse/z_1_filetest.gno b/examples/gno.land/r/demo/disperse/z_1_filetest.gno
@@ -1,3 +1,5 @@
+// PKGPATH: gno.land/r/demo/main
+
 // SEND: 300ugnot
 
 package main
@@ -10,7 +12,7 @@ import (
 
 func main() {
 	disperseAddr := std.DerivePkgAddr("gno.land/r/demo/disperse")
-	mainaddr := std.DerivePkgAddr("main")
+	mainaddr := std.DerivePkgAddr("gno.land/r/demo/main")
 
 	std.TestSetOrigPkgAddr(disperseAddr)
 	std.TestSetOrigCaller(mainaddr)

diff --git a/examples/gno.land/r/demo/disperse/z_2_filetest.gno b/examples/gno.land/r/demo/disperse/z_2_filetest.gno
@@ -1,3 +1,5 @@
+// PKGPATH: gno.land/r/demo/main
+
 // SEND: 300ugnot
 
 package main
@@ -10,7 +12,7 @@ import (
 
 func main() {
 	disperseAddr := std.DerivePkgAddr("gno.land/r/demo/disperse")
-	mainaddr := std.DerivePkgAddr("main")
+	mainaddr := std.DerivePkgAddr("gno.land/r/demo/main")
 
 	std.TestSetOrigPkgAddr(disperseAddr)
 	std.TestSetOrigCaller(mainaddr)

diff --git a/examples/gno.land/r/demo/disperse/z_3_filetest.gno b/examples/gno.land/r/demo/disperse/z_3_filetest.gno
@@ -1,3 +1,5 @@
+// PKGPATH: gno.land/r/demo/main
+
 // SEND: 300ugnot
 
 package main
@@ -11,7 +13,7 @@ import (
 
 func main() {
 	disperseAddr := std.DerivePkgAddr("gno.land/r/demo/disperse")
-	mainaddr := std.DerivePkgAddr("main")
+	mainaddr := std.DerivePkgAddr("gno.land/r/demo/main")
 	beneficiary1 := std.Address("g1dmt3sa5ucvecxuhf3j6ne5r0e3z4x7h6c03xc0")
 	beneficiary2 := std.Address("g1akeqsvhucjt8gf5yupyzjxsjd29wv8fayng37c")
 

diff --git a/examples/gno.land/r/demo/disperse/z_4_filetest.gno b/examples/gno.land/r/demo/disperse/z_4_filetest.gno
@@ -1,3 +1,5 @@
+// PKGPATH: gno.land/r/demo/main
+
 // SEND: 300ugnot
 
 package main
@@ -11,7 +13,7 @@ import (
 
 func main() {
 	disperseAddr := std.DerivePkgAddr("gno.land/r/demo/disperse")
-	mainaddr := std.DerivePkgAddr("main")
+	mainaddr := std.DerivePkgAddr("gno.land/r/demo/main")
 	beneficiary1 := std.Address("g1dmt3sa5ucvecxuhf3j6ne5r0e3z4x7h6c03xc0")
 	beneficiary2 := std.Address("g1akeqsvhucjt8gf5yupyzjxsjd29wv8fayng37c")
 

diff --git a/gnovm/Makefile b/gnovm/Makefile
@@ -54,7 +54,7 @@ lint:
 
 .PHONY: fmt
 fmt:
-	go run ./cmd/gno fmt $(GNOFMT_FLAGS) ./stdlibs/... ./tests/files/extern/... ./tests/stdlibs/...
+	go run ./cmd/gno fmt $(GNOFMT_FLAGS) ./stdlibs/... ./tests/stdlibs/...
 	$(rundep) mvdan.cc/gofumpt $(GOFMT_FLAGS) .
 
 .PHONY: imports

diff --git a/gnovm/tests/files/extern/tata/tutu.gno b/gnovm/tests/files/extern/tata/tutu.gno
@@ -1,5 +1,7 @@
 package tutu
 
+import "github.com/gnolang/gno/_test/baz"
+
 func Quux() string {
 	return quux.Quux()
 }
diff --git a/gnovm/tests/files/extern/toto/titi.gno b/gnovm/tests/files/extern/toto/titi.gno
@@ -1,5 +1,7 @@
 package titi
 
+import "github.com/gnolang/gno/_test/bar"
+
 func Quux() string {
 	return quux.Quux()
 }