docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #941 from dotcloud/makefile_test_subpackages 

gofmt and test sub directories in makefile
This commit is contained in:
Guillaume J. Charmes 2013-06-20 11:18:37 -07:00
parent fa68fe6ff3 2d6a49215c
commit 930e1d8830
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -74,6 +74,9 @@ endif
test: all test: all
@(cd $(DOCKER_DIR); sudo -E go test $(GO_OPTIONS)) @(cd $(DOCKER_DIR); sudo -E go test $(GO_OPTIONS))
testall: all
@(cd $(DOCKER_DIR); sudo -E go test ./... $(GO_OPTIONS))
fmt: fmt:
@gofmt -s -l -w . @gofmt -s -l -w .

2
auth/auth.go
View File

@ -82,7 +82,7 @@ func decodeAuth(authStr string) (*AuthConfig, error) {
func LoadConfig(rootPath string) (*AuthConfig, error) { func LoadConfig(rootPath string) (*AuthConfig, error) {
confFile := path.Join(rootPath, CONFIGFILE) confFile := path.Join(rootPath, CONFIGFILE)
if _, err := os.Stat(confFile); err != nil { if _, err := os.Stat(confFile); err != nil {
return &AuthConfig{rootPath:rootPath}, ErrConfigFileMissing return &AuthConfig{rootPath: rootPath}, ErrConfigFileMissing
} }
b, err := ioutil.ReadFile(confFile) b, err := ioutil.ReadFile(confFile)
if err != nil { if err != nil {

20
term/termios_darwin.go
View File

@ -9,16 +9,16 @@ const (
getTermios = syscall.TIOCGETA getTermios = syscall.TIOCGETA
setTermios = syscall.TIOCSETA setTermios = syscall.TIOCSETA
ECHO = 0x00000008 ECHO = 0x00000008
ONLCR = 0x2 ONLCR = 0x2
ISTRIP = 0x20 ISTRIP = 0x20
INLCR = 0x40 INLCR = 0x40
ISIG = 0x80 ISIG = 0x80
IGNCR = 0x80 IGNCR = 0x80
ICANON = 0x100 ICANON = 0x100
ICRNL = 0x100 ICRNL = 0x100
IXOFF = 0x400 IXOFF = 0x400
IXON = 0x200 IXON = 0x200
) )
type Termios struct { type Termios struct {