From 5f908d77f42fd1b58992141d4484975392f822ef Mon Sep 17 00:00:00 2001 From: Ed McClanahan Date: Fri, 22 Dec 2017 14:24:48 -0800 Subject: [PATCH] Transitioning from regression_test.py to Makefile Note: Depends upon picking up new jrpcclient/regression_test.py option [i.e. be sure to "git submodule update" TODO: Need to check on test_middleware() step (if it's still needed) Need to handle non-CentOS case (i.e. Ubuntu) Need to handle "--deb-builder" case (no "sudo -E" on install steps) --- GoMakefile | 29 +++++++++++ Makefile | 97 ++++++++++++++++++++++++++++++++++++ blunder/Makefile | 3 ++ cleanproxyfs/Makefile | 3 ++ conf/Makefile | 3 ++ dlm/Makefile | 3 ++ fs/Makefile | 3 ++ fsworkout/Makefile | 3 ++ fuse/Makefile | 3 ++ headhunter/Makefile | 3 ++ httpserver/Makefile | 3 ++ inode/Makefile | 3 ++ inodeworkout/Makefile | 3 ++ jrpcclient | 2 +- jrpcfs/Makefile | 3 ++ logger/Makefile | 3 ++ mkproxyfs/Makefile | 3 ++ mkproxyfs/mkproxyfs/Makefile | 3 ++ pfs-stress/Makefile | 3 ++ pfsconfjson/Makefile | 3 ++ pfsconfjsonpacked/Makefile | 3 ++ pfsworkout/Makefile | 3 ++ platform/Makefile | 3 ++ proxyfsd/Makefile | 3 ++ proxyfsd/proxyfsd/Makefile | 3 ++ ramswift/Makefile | 3 ++ ramswift/ramswift/Makefile | 3 ++ stats/Makefile | 3 ++ statslogger/Makefile | 3 ++ swiftclient/Makefile | 3 ++ utils/Makefile | 3 ++ 31 files changed, 211 insertions(+), 1 deletion(-) create mode 100644 GoMakefile create mode 100644 Makefile create mode 100644 blunder/Makefile create mode 100644 cleanproxyfs/Makefile create mode 100644 conf/Makefile create mode 100644 dlm/Makefile create mode 100644 fs/Makefile create mode 100644 fsworkout/Makefile create mode 100644 fuse/Makefile create mode 100644 headhunter/Makefile create mode 100644 httpserver/Makefile create mode 100644 inode/Makefile create mode 100644 inodeworkout/Makefile create mode 100644 jrpcfs/Makefile create mode 100644 logger/Makefile create mode 100644 mkproxyfs/Makefile create mode 100644 mkproxyfs/mkproxyfs/Makefile create mode 100644 pfs-stress/Makefile create mode 100644 pfsconfjson/Makefile create mode 100644 pfsconfjsonpacked/Makefile create mode 100644 pfsworkout/Makefile create mode 100644 platform/Makefile create mode 100644 proxyfsd/Makefile create mode 100644 proxyfsd/proxyfsd/Makefile create mode 100644 ramswift/Makefile create mode 100644 ramswift/ramswift/Makefile create mode 100644 stats/Makefile create mode 100644 statslogger/Makefile create mode 100644 swiftclient/Makefile create mode 100644 utils/Makefile diff --git a/GoMakefile b/GoMakefile new file mode 100644 index 000000000..3890caa01 --- /dev/null +++ b/GoMakefile @@ -0,0 +1,29 @@ +# GoMakefile is a template to be included by Go package Makefile's in this repo + +all: fmt install generate test vet + +.PHONY: all bench clean cover fmt generate install test vet + +bench: + go test -bench $(gosubdir) + +clean: + go clean -i $(gosubdir) + +cover: + go test -cover $(gosubdir) + +fmt: + go fmt $(gosubdir) + +generate: + go generate $(gosubdir) + +install: + go install -gcflags "-N -l" $(gosubdir) + +test: + go test $(gosubdir) + +vet: + go vet $(gosubdir) diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..8e94135a9 --- /dev/null +++ b/Makefile @@ -0,0 +1,97 @@ +gosubdirs = \ + blunder \ + cleanproxyfs \ + conf \ + dlm \ + fs \ + fsworkout \ + fuse \ + headhunter \ + httpserver \ + inode \ + inodeworkout \ + jrpcfs \ + logger \ + mkproxyfs mkproxyfs/mkproxyfs \ + pfs-stress \ + pfsconfjson pfsconfjsonpacked \ + pfsworkout \ + platform \ + proxyfsd proxyfsd/proxyfsd \ + ramswift ramswift/ramswift \ + stats \ + statslogger \ + swiftclient \ + utils + +uname := $(shell uname) + +ifeq ($(uname),Linux) + all: fmt install stringer generate test vet c-clean c-build c-install c-test +else + all: fmt install stringer generate test vet +endif + +.PHONY: all bench c-build c-clean c-install c-test clean cover fmt generate install stringer test vet + +bench: + @for gosubdir in $(gosubdirs); do \ + $(MAKE) --no-print-directory -C $$gosubdir bench; \ + done + +c-build: + $(MAKE) --no-print-directory -C jrpcclient all + $(MAKE) --no-print-directory -C vfs + +c-clean: + $(MAKE) --no-print-directory -C jrpcclient clean + $(MAKE) --no-print-directory -C vfs clean + +c-install: + # TODO: For both jrpcclient & vfs: + # Need to handle deb-builder case that doesn't want to use "sudo -E" to invoke $(MAKE) + # Need to handle non-CentOS case that wants to just do $(MAKE) install + sudo -E $(MAKE) --no-print-directory -C jrpcclient installcentos + sudo -E $(MAKE) --no-print-directory -C vfs installcentos + +c-test: + cd jrpcclient ; ./regression_test.py --just-test-libs ; cd - + +clean: + rm -f $(GOPATH)/bin/stringer + @for gosubdir in $(gosubdirs); do \ + $(MAKE) --no-print-directory -C $$gosubdir clean; \ + done + +cover: + @for gosubdir in $(gosubdirs); do \ + $(MAKE) --no-print-directory -C $$gosubdir cover; \ + done + +fmt: + @for gosubdir in $(gosubdirs); do \ + $(MAKE) --no-print-directory -C $$gosubdir fmt; \ + done + +generate: + @for gosubdir in $(gosubdirs); do \ + $(MAKE) --no-print-directory -C $$gosubdir generate; \ + done + +install: + @for gosubdir in $(gosubdirs); do \ + $(MAKE) --no-print-directory -C $$gosubdir install; \ + done + +stringer: + go install github.com/swiftstack/ProxyFS/vendor/golang.org/x/tools/cmd/stringer + +test: + @for gosubdir in $(gosubdirs); do \ + $(MAKE) --no-print-directory -C $$gosubdir test; \ + done + +vet: + @for gosubdir in $(gosubdirs); do \ + $(MAKE) --no-print-directory -C $$gosubdir vet; \ + done diff --git a/blunder/Makefile b/blunder/Makefile new file mode 100644 index 000000000..b99620fbe --- /dev/null +++ b/blunder/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/blunder + +include ../GoMakefile diff --git a/cleanproxyfs/Makefile b/cleanproxyfs/Makefile new file mode 100644 index 000000000..2786b7141 --- /dev/null +++ b/cleanproxyfs/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/cleanproxyfs + +include ../GoMakefile diff --git a/conf/Makefile b/conf/Makefile new file mode 100644 index 000000000..7011d1a86 --- /dev/null +++ b/conf/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/conf + +include ../GoMakefile diff --git a/dlm/Makefile b/dlm/Makefile new file mode 100644 index 000000000..8cace52a9 --- /dev/null +++ b/dlm/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/dlm + +include ../GoMakefile diff --git a/fs/Makefile b/fs/Makefile new file mode 100644 index 000000000..34cc341eb --- /dev/null +++ b/fs/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/fs + +include ../GoMakefile diff --git a/fsworkout/Makefile b/fsworkout/Makefile new file mode 100644 index 000000000..2c2dc997c --- /dev/null +++ b/fsworkout/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/fsworkout + +include ../GoMakefile diff --git a/fuse/Makefile b/fuse/Makefile new file mode 100644 index 000000000..885142120 --- /dev/null +++ b/fuse/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/fuse + +include ../GoMakefile diff --git a/headhunter/Makefile b/headhunter/Makefile new file mode 100644 index 000000000..7fb20d598 --- /dev/null +++ b/headhunter/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/headhunter + +include ../GoMakefile diff --git a/httpserver/Makefile b/httpserver/Makefile new file mode 100644 index 000000000..b2943554a --- /dev/null +++ b/httpserver/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/httpserver + +include ../GoMakefile diff --git a/inode/Makefile b/inode/Makefile new file mode 100644 index 000000000..31e49b6e9 --- /dev/null +++ b/inode/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/inode + +include ../GoMakefile diff --git a/inodeworkout/Makefile b/inodeworkout/Makefile new file mode 100644 index 000000000..e3bef3fde --- /dev/null +++ b/inodeworkout/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/inodeworkout + +include ../GoMakefile diff --git a/jrpcclient b/jrpcclient index becf79b88..a0bf87334 160000 --- a/jrpcclient +++ b/jrpcclient @@ -1 +1 @@ -Subproject commit becf79b88b9c4ae4ae069963cd830ac1ec7c9e78 +Subproject commit a0bf87334587cea596fe6d0f292772bd9873e956 diff --git a/jrpcfs/Makefile b/jrpcfs/Makefile new file mode 100644 index 000000000..ed0838ad3 --- /dev/null +++ b/jrpcfs/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/jrpcfs + +include ../GoMakefile diff --git a/logger/Makefile b/logger/Makefile new file mode 100644 index 000000000..5da3201c7 --- /dev/null +++ b/logger/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/logger + +include ../GoMakefile diff --git a/mkproxyfs/Makefile b/mkproxyfs/Makefile new file mode 100644 index 000000000..2242a8fe7 --- /dev/null +++ b/mkproxyfs/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/mkproxyfs + +include ../GoMakefile diff --git a/mkproxyfs/mkproxyfs/Makefile b/mkproxyfs/mkproxyfs/Makefile new file mode 100644 index 000000000..fe06f5e98 --- /dev/null +++ b/mkproxyfs/mkproxyfs/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/mkproxyfs/mkproxyfs + +include ../../GoMakefile diff --git a/pfs-stress/Makefile b/pfs-stress/Makefile new file mode 100644 index 000000000..228915b7e --- /dev/null +++ b/pfs-stress/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/pfs-stress + +include ../GoMakefile diff --git a/pfsconfjson/Makefile b/pfsconfjson/Makefile new file mode 100644 index 000000000..c4fa7b84c --- /dev/null +++ b/pfsconfjson/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/pfsconfjson + +include ../GoMakefile diff --git a/pfsconfjsonpacked/Makefile b/pfsconfjsonpacked/Makefile new file mode 100644 index 000000000..a9f756076 --- /dev/null +++ b/pfsconfjsonpacked/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/pfsconfjsonpacked + +include ../GoMakefile diff --git a/pfsworkout/Makefile b/pfsworkout/Makefile new file mode 100644 index 000000000..a7f9552cf --- /dev/null +++ b/pfsworkout/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/pfsworkout + +include ../GoMakefile diff --git a/platform/Makefile b/platform/Makefile new file mode 100644 index 000000000..f6a63311f --- /dev/null +++ b/platform/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/platform + +include ../GoMakefile diff --git a/proxyfsd/Makefile b/proxyfsd/Makefile new file mode 100644 index 000000000..7132a02e2 --- /dev/null +++ b/proxyfsd/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/proxyfsd + +include ../GoMakefile diff --git a/proxyfsd/proxyfsd/Makefile b/proxyfsd/proxyfsd/Makefile new file mode 100644 index 000000000..c2338ebce --- /dev/null +++ b/proxyfsd/proxyfsd/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/proxyfsd/proxyfsd + +include ../../GoMakefile diff --git a/ramswift/Makefile b/ramswift/Makefile new file mode 100644 index 000000000..070587fa0 --- /dev/null +++ b/ramswift/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/ramswift + +include ../GoMakefile diff --git a/ramswift/ramswift/Makefile b/ramswift/ramswift/Makefile new file mode 100644 index 000000000..943a5c8c1 --- /dev/null +++ b/ramswift/ramswift/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/ramswift/ramswift + +include ../../GoMakefile diff --git a/stats/Makefile b/stats/Makefile new file mode 100644 index 000000000..f76736e39 --- /dev/null +++ b/stats/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/stats + +include ../GoMakefile diff --git a/statslogger/Makefile b/statslogger/Makefile new file mode 100644 index 000000000..799c5c34a --- /dev/null +++ b/statslogger/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/statslogger + +include ../GoMakefile diff --git a/swiftclient/Makefile b/swiftclient/Makefile new file mode 100644 index 000000000..b521c40b7 --- /dev/null +++ b/swiftclient/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/swiftclient + +include ../GoMakefile diff --git a/utils/Makefile b/utils/Makefile new file mode 100644 index 000000000..37301b23c --- /dev/null +++ b/utils/Makefile @@ -0,0 +1,3 @@ +gosubdir := github.com/swiftstack/ProxyFS/utils + +include ../GoMakefile