Skip to content

Instantly share code, notes, and snippets.

@bloodeagle40234
Last active January 28, 2019 12:00
Show Gist options
  • Save bloodeagle40234/8d6468c9228808f0ebef00ab0788d3c6 to your computer and use it in GitHub Desktop.
Save bloodeagle40234/8d6468c9228808f0ebef00ab0788d3c6 to your computer and use it in GitHub Desktop.
Diff for ProxyFS run-able
ubuntu@saio:~/go/src/github.com/swiftstack/ProxyFS$ git diff Makefile
diff --git a/Makefile b/Makefile
index a0fb22f..90b3381 100644
--- a/Makefile
+++ b/Makefile
@@ -60,28 +60,28 @@ bench:
c-build:
$(MAKE) -w -C jrpcclient all
- $(MAKE) -w -C vfs
+ # $(MAKE) -w -C vfs
c-clean:
$(MAKE) -w -C jrpcclient clean
- $(MAKE) -w -C vfs clean
+ # $(MAKE) -w -C vfs clean
c-install:
ifeq ($(distro),CentOS Linux)
sudo -E $(MAKE) -w -C jrpcclient installcentos
- sudo -E $(MAKE) -w -C vfs installcentos
+ # sudo -E $(MAKE) -w -C vfs installcentos
else
sudo -E $(MAKE) -w -C jrpcclient install
- sudo -E $(MAKE) -w -C vfs install
+ # sudo -E $(MAKE) -w -C vfs install
endif
c-install-deb-builder:
ifeq ($(distro),CentOS Linux)
$(MAKE) -w -C jrpcclient installcentos
- $(MAKE) -w -C vfs installcentos
+ # $(MAKE) -w -C vfs installcentos
else
$(MAKE) -w -C jrpcclient install
- $(MAKE) -w -C vfs install
+ # $(MAKE) -w -C vfs install
endif
c-test:
@@ -143,7 +143,7 @@ install:
done
python-test:
- cd pfs_middleware && tox -e py27,py27-old-swift,lint
+ cd pfs_middleware && tox -e py27,py27-old-swift
stringer:
go install github.com/swiftstack/ProxyFS/vendor/golang.org/x/tools/cmd/stringer
ubuntu@saio:~/go/src/github.com/swiftstack/ProxyFS$ git diff pfs_middleware/tox.ini
diff --git a/pfs_middleware/tox.ini b/pfs_middleware/tox.ini
index 1c1b044..906f621 100644
--- a/pfs_middleware/tox.ini
+++ b/pfs_middleware/tox.ini
@@ -1,13 +1,14 @@
[tox]
-envlist = py27,py27-old-swift,py27-swift-master,lint
+#envlist = py27,py27-old-swift,py27-swift-master,lint
+envlist = py27,py27-old-swift,py27-swift-master
[testenv]
deps = -r{toxinidir}/test-requirements.txt
commands = python -m unittest discover
-[testenv:lint]
-basepython = python2.7
-commands = flake8 {posargs:pfs_middleware tests setup.py}
+#[testenv:lint]
+#basepython = python2.7
+#commands = flake8 {posargs:pfs_middleware tests setup.py}
[testenv:py27]
usedevelop = True
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment