Merge pull request #630 from gao-feng/hyperstart

gao-feng · web-flow · commit 15c16ef28457 · 2017-10-26T17:26:12.000+08:00
update hyper kernel path
diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh
@@ -11,7 +11,7 @@ set -o pipefail
 export HYPERSTARTPATH="$GOPATH/src/github.com/hyperhq/hyperstart"
 export RUNVPATH="$GOPATH/src/github.com/hyperhq/runv"
 cd $HYPERSTARTPATH && ./autogen.sh && ./configure && make
-cp -v $HYPERSTARTPATH/build/{kernel,hyper-initrd.img} $RUNVPATH/tests/go-integration/test_data/
+cp -v $HYPERSTARTPATH/build/{arch/x86_64/kernel,hyper-initrd.img} $RUNVPATH/tests/go-integration/test_data/
 
 # do runv integration-test
 cd $RUNVPATH
diff --git a/tests/bats-integration/helpers.bash b/tests/bats-integration/helpers.bash
@@ -51,7 +51,7 @@ function runv() {
 
 # Raw wrapper for runv.
 function __runv() {
-	"$RUNVPATH"/runv --kernel "$HYPERSTARTPATH"/build/kernel --initrd "$HYPERSTARTPATH"/build/hyper-initrd.img --debug --root "$ROOT" "$@"
+	"$RUNVPATH"/runv --kernel "$HYPERSTARTPATH"/build/arch/x86_64/kernel --initrd "$HYPERSTARTPATH"/build/hyper-initrd.img --debug --root "$ROOT" "$@"
 }
 
 # Wrapper for runv spec.

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ function runv() {`
`51`	`51`
`52`	`52`	`# Raw wrapper for runv.`
`53`	`53`	`function __runv() {`
`54`		`- "$RUNVPATH"/runv --kernel "$HYPERSTARTPATH"/build/kernel --initrd "$HYPERSTARTPATH"/build/hyper-initrd.img --debug --root "$ROOT" "$@"`
	`54`	`+ "$RUNVPATH"/runv --kernel "$HYPERSTARTPATH"/build/arch/x86_64/kernel --initrd "$HYPERSTARTPATH"/build/hyper-initrd.img --debug --root "$ROOT" "$@"`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`# Wrapper for runv spec.`