Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
457d671c
M
minikube
项目概览
Chu Peng 楚鹏
/
minikube
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
minikube
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
457d671c
编写于
1月 16, 2019
作者:
T
Thomas Strömberg
提交者:
GitHub
1月 16, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3229 from afbjorklund/makedepend-buildroot
Avoid out directory, when listing test files
上级
7157b43f
d13a2664
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
13 deletion
+13
-13
Makefile
Makefile
+6
-6
makedepend.sh
makedepend.sh
+6
-6
test.sh
test.sh
+1
-1
未找到文件。
Makefile
浏览文件 @
457d671c
...
...
@@ -62,7 +62,7 @@ HYPERKIT_FILES := ./cmd/drivers/hyperkit
STORAGE_PROVISIONER_FILES
:=
./cmd/storage-provisioner
KVM_DRIVER_FILES
:=
./cmd/drivers/kvm/
MINIKUBE_TEST_FILES
:=
./...
MINIKUBE_TEST_FILES
:=
./
cmd/... ./pkg/
...
MINIKUBE_BUILD_TAGS
:=
container_image_ostree_stub containers_image_openpgp
MINIKUBE_INTEGRATION_BUILD_TAGS
:=
integration
$(MINIKUBE_BUILD_TAGS)
...
...
@@ -94,7 +94,7 @@ out/minikube-windows-amd64.exe: out/minikube-windows-amd64
cp
out/minikube-windows-amd64 out/minikube-windows-amd64.exe
out/minikube.d
:
pkg/minikube/assets/assets.go
$(MAKEDEPEND)
out/minikube-
$(GOOS)
-
$(GOARCH)
$(ORG)
$
(MINIKUBEFILES)
$^
>
$@
$(MAKEDEPEND)
out/minikube-
$(GOOS)
-
$(GOARCH)
$(ORG)
$
^
$(MINIKUBEFILES)
>
$@
-include
out/minikube.d
out/minikube-%-$(GOARCH)
:
pkg/minikube/assets/assets.go
...
...
@@ -189,7 +189,7 @@ integration-versioned: out/minikube
.PHONY
:
test
out/test.d
:
pkg/minikube/assets/assets.go
$(MAKEDEPEND)
-t
test
$(ORG)
$
(MINIKUBE_TEST_FILES)
$^
>
$@
$(MAKEDEPEND)
-t
test
$(ORG)
$
^
$(MINIKUBE_TEST_FILES)
>
$@
-include
out/test.d
test
:
...
...
@@ -263,7 +263,7 @@ out/minikube-installer.exe: out/minikube-windows-amd64.exe
rm
-rf
out/windows_tmp
out/docker-machine-driver-hyperkit.d
:
$(MAKEDEPEND)
out/docker-machine-driver-hyperkit
$(ORG)
$
(HYPERKIT_FILES)
$^
>
$@
$(MAKEDEPEND)
out/docker-machine-driver-hyperkit
$(ORG)
$
^
$(HYPERKIT_FILES)
>
$@
-include
out/docker-machine-driver-hyperkit.d
out/docker-machine-driver-hyperkit
:
...
...
@@ -290,7 +290,7 @@ $(ISO_BUILD_IMAGE): deploy/iso/minikube-iso/Dockerfile
@
echo
"
$
(@) successfully built"
out/storage-provisioner.d
:
$(MAKEDEPEND)
out/storage-provisioner
$(ORG)
$
(STORAGE_PROVISIONER_FILES)
$^
>
$@
$(MAKEDEPEND)
out/storage-provisioner
$(ORG)
$
^
$(STORAGE_PROVISIONER_FILES)
>
$@
-include
out/storage-provisioner.d
out/storage-provisioner
:
...
...
@@ -327,7 +327,7 @@ release-minikube: out/minikube checksum
gsutil
cp
out/minikube-
$(GOOS)
-
$(GOARCH)
.sha256
$(MINIKUBE_UPLOAD_LOCATION)
/
$(MINIKUBE_VERSION)
/minikube-
$(GOOS)
-
$(GOARCH)
.sha256
out/docker-machine-driver-kvm2.d
:
$(MAKEDEPEND)
out/docker-machine-driver-kvm2
$(ORG)
$
(KVM_DRIVER_FILES)
$^
>
$@
$(MAKEDEPEND)
out/docker-machine-driver-kvm2
$(ORG)
$
^
$(KVM_DRIVER_FILES)
>
$@
-include
out/docker-machine-driver-kvm2.d
out/docker-machine-driver-kvm2
:
...
...
makedepend.sh
浏览文件 @
457d671c
...
...
@@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Generate go dependencies, for make. Uses `go list
"
.
# Usage: makedepend.sh [-t] output package
path [extra]
# Generate go dependencies, for make. Uses `go list
`
.
# Usage: makedepend.sh [-t] output package
extra path...
PATH_FORMAT
=
'{{ .ImportPath }}{{"\n"}}{{join .Deps "\n"}}'
FILE_FORMAT
=
'{{ range $file := .GoFiles }} {{$.Dir}}/{{$file}}{{"\n"}}{{end}}'
...
...
@@ -28,14 +28,14 @@ fi
out
=
$1
pkg
=
$2
path
=
$3
extra
=
$4
extra
=
$3
paths
=
"
$4
$5
$6
"
# check for mandatory parameters
test
-n
"
$out$pkg$path
"
||
exit
1
test
-n
"
$out$pkg$path
s
"
||
exit
1
echo
"
$out
:
$extra
\\
"
go list
-f
"
$PATH_FORMAT
"
$path
|
go list
-f
"
$PATH_FORMAT
"
$path
s
|
grep
"
$pkg
"
|
xargs go list
-f
"
$FILE_FORMAT
"
|
sed
-e
"s|^
${
GOPATH
}
|
\$
(GOPATH)|;s/
$/
\\\\
/"
...
...
test.sh
浏览文件 @
457d671c
...
...
@@ -34,7 +34,7 @@ echo "Running go tests..."
cd
${
GOPATH
}
/src/
${
REPO_PATH
}
rm
-f
out/
$COV_FILE
||
true
echo
"mode: count"
>
out/
$COV_FILE
for
pkg
in
$(
go list
-f
'{{ if .TestGoFiles }} {{.ImportPath}} {{end}}'
./...
)
;
do
for
pkg
in
$(
go list
-f
'{{ if .TestGoFiles }} {{.ImportPath}} {{end}}'
./
cmd/... ./pkg/
...
)
;
do
go
test
-tags
"container_image_ostree_stub containers_image_openpgp"
-v
$pkg
-covermode
=
count
-coverprofile
=
out/
$COV_TMP_FILE
# tail -n +2 skips the first line of the file
# for coverprofile the first line is the `mode: count` line which we only want once in our file
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录