summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/projects/go/static_library/src/module/add.go (renamed from tests/projects/go/static_library/src/test/add.go)0
-rw-r--r--tests/projects/go/static_library/src/module/sub.go (renamed from tests/projects/go/static_library/src/test/sub.go)0
-rw-r--r--tests/projects/go/static_library/src/test.go3
-rw-r--r--tests/projects/go/static_library/xmake.lua2
-rw-r--r--xmake/templates/go/static/project/src/test/add.go6
-rw-r--r--xmake/templates/go/static/project/src/test/sub.go6
-rw-r--r--xmake/templates/go/static/project/xmake.lua2
7 files changed, 3 insertions, 16 deletions
diff --git a/tests/projects/go/static_library/src/test/add.go b/tests/projects/go/static_library/src/module/add.go
index 98ffef600..98ffef600 100644
--- a/tests/projects/go/static_library/src/test/add.go
+++ b/tests/projects/go/static_library/src/module/add.go
diff --git a/tests/projects/go/static_library/src/test/sub.go b/tests/projects/go/static_library/src/module/sub.go
index a24a9abb7..a24a9abb7 100644
--- a/tests/projects/go/static_library/src/test/sub.go
+++ b/tests/projects/go/static_library/src/module/sub.go
diff --git a/tests/projects/go/static_library/src/test.go b/tests/projects/go/static_library/src/test.go
index c4e13af53..cba3d835e 100644
--- a/tests/projects/go/static_library/src/test.go
+++ b/tests/projects/go/static_library/src/test.go
@@ -2,11 +2,10 @@ package main
import (
"fmt"
- "test"
+ "module"
)
func Run() {
-
fmt.Printf("add: %d\n", module.Add(1, 2));
fmt.Printf("sub: %d\n", module.Sub(1, 2));
}
diff --git a/tests/projects/go/static_library/xmake.lua b/tests/projects/go/static_library/xmake.lua
index 99ca434f9..d4921aabf 100644
--- a/tests/projects/go/static_library/xmake.lua
+++ b/tests/projects/go/static_library/xmake.lua
@@ -2,7 +2,7 @@ add_rules("mode.debug", "mode.release")
target("module")
set_kind("static")
- add_files("src/test/*.go")
+ add_files("src/module/*.go")
target("test")
set_kind("binary")
diff --git a/xmake/templates/go/static/project/src/test/add.go b/xmake/templates/go/static/project/src/test/add.go
deleted file mode 100644
index 98ffef600..000000000
--- a/xmake/templates/go/static/project/src/test/add.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package module
-
-func Add(a int, b int) int {
- return a + b;
-}
-
diff --git a/xmake/templates/go/static/project/src/test/sub.go b/xmake/templates/go/static/project/src/test/sub.go
deleted file mode 100644
index a24a9abb7..000000000
--- a/xmake/templates/go/static/project/src/test/sub.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package module
-
-func Sub(a int, b int) int {
- return a - b;
-}
-
diff --git a/xmake/templates/go/static/project/xmake.lua b/xmake/templates/go/static/project/xmake.lua
index 2e06e32ff..076ac6460 100644
--- a/xmake/templates/go/static/project/xmake.lua
+++ b/xmake/templates/go/static/project/xmake.lua
@@ -2,7 +2,7 @@ add_rules("mode.debug", "mode.release")
target("module")
set_kind("static")
- add_files("src/test/*.go")
+ add_files("src/module/*.go")
target("${TARGETNAME}_demo")
set_kind("binary")