Merge lp:~elopio/snappy/go-tests5 into lp:~fgimenez/snappy/cross-compile-debs

[Leo Arias]

[lp:~elopio/snappy/go-tests5]

511. By Leo Arias on 2015-06-19

Use the builder option.

[Federico Gimenez (fgimenez)]

Much better, thanks!

review: Approve

=== modified file '_integration-tests/README'
--- _integration-tests/README	2015-06-15 15:36:29 +0000
+++ _integration-tests/README	2015-06-19 06:58:30 +0000
@@ -1,6 +1,5 @@
 # Automatic testing for snappy
 
-
 ## qemu based x86 testing
 
 Run locally with:
@@ -14,3 +13,10 @@
 
 $ adt-run $(pwd)/ --- ssh --reboot -l ubuntu -P ubuntu --reboot -H webdm.local
 
+## Native Go tests
+
+Having golang installed, you can execute the full suite (including both go and
+shell tests) with:
+
+$ go run _integration-test/main.go
+

=== modified file '_integration-tests/main.go'
--- _integration-tests/main.go	2015-06-16 15:19:59 +0000
+++ _integration-tests/main.go	2015-06-19 06:58:30 +0000
@@ -18,21 +18,22 @@
 )
 
 var (
-	debsDir     = filepath.Join(baseDir, "debs")
-	imageDir    = filepath.Join(baseDir, "image")
-	outputDir   = filepath.Join(baseDir, "output")
-	imageTarget = filepath.Join(imageDir, "snappy.img")
-
-	arch      = flag.String("arch", defaultArch, "Target architecture (amd64, armhf)")
-	testbedIP = flag.String("ip", "", "IP of the testbed to run the tests in")
-
+	defaultDebsDir   = filepath.Join(baseDir, "debs")
+	imageDir         = filepath.Join(baseDir, "image")
+	outputDir        = filepath.Join(baseDir, "output")
+	imageTarget      = filepath.Join(imageDir, "snappy.img")
 	commonSSHOptions = []string{
 		"ssh", "-s", "/usr/share/autopkgtest/ssh-setup/snappy"}
 	kvmSSHOptions = append(commonSSHOptions, []string{"--", "-i", imageTarget}...)
+	debsDir       string
+	arch          string
+	testbedIP     string
 )
 
 func init() {
-	flag.Parse()
+	flag.StringVar(&debsDir, "debs-dir", defaultDebsDir, "Directory with the snappy debian packages.")
+	flag.StringVar(&arch, "arch", defaultArch, "Target architecture (amd64, armhf)")
+	flag.StringVar(&testbedIP, "ip", "", "IP of the testbed to run the tests in")
 }
 
 func execCommand(cmds ...string) {
@@ -40,28 +41,32 @@
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	if err := cmd.Run(); err != nil {
-		log.Fatal(err)
+		log.Fatalf("Error while running %s: %s\n", cmd.Args, err)
 	}
 }
 
-func buildDebs(rootPath string, arch string) {
+func buildDebs(rootPath, arch string) {
 	fmt.Println("Building debs...")
 	prepareTargetDir(debsDir)
-	if arch == defaultArch {
-		execCommand(
-			"bzr", "bd",
-			fmt.Sprintf("--result-dir=%s", debsDir),
-			rootPath,
-			"--", "-uc", "-us")
+	buildCommand := []string{"bzr", "bd",
+		fmt.Sprintf("--result-dir=%s", debsDir),
+		"--split",
+		rootPath,
+	}
+	if arch != defaultArch {
+		builderOption := []string{
+			fmt.Sprintf(
+				"--builder=sbuild --build amd64 --host %s --dist wily", arch)}
+		buildCommand = append(buildCommand, builderOption...)
 	} else {
-		execCommand(
-			"sbuild", "--build=amd64",
-			fmt.Sprintf("--host=%s", arch),
-			"-d", "wily")
+		dontSignDebs := []string{"--", "-uc", "-us"}
+		buildCommand = append(buildCommand, dontSignDebs...)
 	}
+	fmt.Println(buildCommand)
+	execCommand(buildCommand...)
 }
 
-func createImage(release, channel string, arch string) {
+func createImage(release, channel, arch string) {
 	fmt.Println("Creating image...")
 	prepareTargetDir(imageDir)
 	execCommand(
@@ -92,9 +97,9 @@
 	execCommand(append(cmd, sshOptions...)...)
 }
 
-func boardSSHOptions(testbedIP *string) []string {
+func remoteTestbedSSHOptions(testbedIP string) []string {
 	options := []string{
-		"-H", *testbedIP,
+		"-H", testbedIP,
 	}
 	return append(commonSSHOptions, options...)
 }
@@ -120,14 +125,17 @@
 }
 
 func main() {
+	flag.Parse()
+
 	rootPath := getRootPath()
 
-	buildDebs(rootPath, *arch)
-
-	if *arch == defaultArch {
+	if debsDir == defaultDebsDir {
+		buildDebs(rootPath, arch)
+	}
+	if arch == defaultArch {
 		createImage(defaultRelease, defaultChannel, getArchForImage())
 		adtRun(rootPath, kvmSSHOptions)
 	} else {
-		adtRun(rootPath, boardSSHOptions(testbedIP))
+		//adtRun(rootPath, remoteTestbedSSHOptions(testbedIP))
 	}
 }

=== modified file '_integration-tests/tests/snappy_test.go'
--- _integration-tests/tests/snappy_test.go	2015-06-16 14:55:01 +0000
+++ _integration-tests/tests/snappy_test.go	2015-06-19 06:58:30 +0000
@@ -1,4 +1,4 @@
-package snappy
+package tests
 
 import (
 	"os/exec"

=== modified file 'debian/rules'
--- debian/rules	2015-06-15 15:36:29 +0000
+++ debian/rules	2015-06-19 06:58:30 +0000
@@ -53,8 +53,8 @@
 
 override_dh_auto_build:
 	dh_auto_build
-	GOPATH=$$PWD/$(DH_BUILDDIR) go test -c _integration-tests/tests/snappy_test.go
-	mv snappy.test $$PWD/$(DH_BUILDDIR)/bin
+	GOPATH=$$PWD/$(DH_BUILDDIR) go test -c ./_integration-tests/tests
+	mv tests.test $$PWD/$(DH_BUILDDIR)/bin/snappy.test
 
 override_dh_auto_install:
 	dh_auto_install -O--buildsystem=golang