Browse code

Merge pull request #941 from dotcloud/makefile_test_subpackages

gofmt and test sub directories in makefile

Guillaume J. Charmes authored on 2013/06/21 03:18:37
Showing 3 changed files
... ...
@@ -74,6 +74,9 @@ endif
74 74
 test: all
75 75
 	@(cd $(DOCKER_DIR); sudo -E go test $(GO_OPTIONS))
76 76
 
77
+testall: all
78
+	@(cd $(DOCKER_DIR); sudo -E go test ./... $(GO_OPTIONS))
79
+
77 80
 fmt:
78 81
 	@gofmt -s -l -w .
79 82
 
... ...
@@ -82,7 +82,7 @@ func decodeAuth(authStr string) (*AuthConfig, error) {
82 82
 func LoadConfig(rootPath string) (*AuthConfig, error) {
83 83
 	confFile := path.Join(rootPath, CONFIGFILE)
84 84
 	if _, err := os.Stat(confFile); err != nil {
85
-		return &AuthConfig{rootPath:rootPath}, ErrConfigFileMissing
85
+		return &AuthConfig{rootPath: rootPath}, ErrConfigFileMissing
86 86
 	}
87 87
 	b, err := ioutil.ReadFile(confFile)
88 88
 	if err != nil {
... ...
@@ -9,16 +9,16 @@ const (
9 9
 	getTermios = syscall.TIOCGETA
10 10
 	setTermios = syscall.TIOCSETA
11 11
 
12
-	ECHO    = 0x00000008
13
-	ONLCR   = 0x2
14
-	ISTRIP  = 0x20
15
-	INLCR   = 0x40
16
-	ISIG    = 0x80
17
-	IGNCR   = 0x80
18
-	ICANON  = 0x100
19
-	ICRNL   = 0x100
20
-	IXOFF   = 0x400
21
-	IXON    = 0x200
12
+	ECHO   = 0x00000008
13
+	ONLCR  = 0x2
14
+	ISTRIP = 0x20
15
+	INLCR  = 0x40
16
+	ISIG   = 0x80
17
+	IGNCR  = 0x80
18
+	ICANON = 0x100
19
+	ICRNL  = 0x100
20
+	IXOFF  = 0x400
21
+	IXON   = 0x200
22 22
 )
23 23
 
24 24
 type Termios struct {