Skip to content

P
Pyston
Commit 40636a33 authored by Kevin Modzelewski's avatar Kevin Modzelewski
Browse files
Options

Separate linting features from the tester, and add the google linter for testing

parent a5981a76
Hide whitespace changes
Inline Side-by-side
Showing with 4904 additions and 144 deletions
src/Makefile
View file @ 40636a33
......@@ -320,6 +320,13 @@ analyze:
--use-analyzer $(CLANG_EXE) --use-c++ $(CLANG_EXE) -V \
$(MAKE) pyston_dbg USE_DISTCC=0 USE_CCACHE=0
.PHONY: lint cpplint
lint:
$(ECHO) linting...
$(VERB) python ../tools/lint.py
cpplint:
$(VERB) python ../tools/cpplint.py --filter=-whitespace,-build/header_guard,-build/include_order,-readability/todo $(SRCS)
.PHONY: test test_debug test_prof test_release
test_debug: pyston_dbg ext
python ../tools/tester.py -j$(TEST_THREADS) -k $(TESTS_DIR) $(ARGS)
......@@ -333,8 +340,9 @@ test_prof: pyston_prof ext
python ../tools/tester.py -P -j$(TEST_THREADS) -k $(TESTS_DIR) $(ARGS)
python ../tools/tester.py -P -j$(TEST_THREADS) -a -n -k $(TESTS_DIR) $(ARGS)
python ../tools/tester.py -P -j$(TEST_THREADS) -a -O -k $(TESTS_DIR) $(ARGS)
check test: ext pyston_dbg
$(MAKE) pyston_dbg
check:
$(MAKE) lint
$(MAKE) ext pyston_dbg
# $(MAKE) run_unittests
$(MAKE) test_debug
$(MAKE) test_release
......@@ -346,6 +354,7 @@ check test: ext pyston_dbg
$(call checksha,./pyston_prof -cqO $(TESTS_DIR)/raytrace_small.py,0544f4621dd45fe94205219488a2576b84dc044d)
$(MAKE) run_unittests
$(MAKE) check_format
echo "All tests passed"
......
tools/cpplint.py 0 → 100644
View file @ 40636a33
This source diff could not be displayed because it is too large. You can view the blob instead.
tools/lint.py 0 → 100644
View file @ 40636a33
import os
def verify_include(_, dir, files):
for bn in files:
fn = os.path.join(dir, bn)
if not bn.endswith(".h"):
continue
expected_guard = "PYSTON" + fn[1:-2].replace('_', '').replace('/', '_').upper() + "_H"
with open(fn) as f:
while True:
l = f.readline()
if l.startswith('//') or not l.strip():
continue
break
gotten_guard = l.split()[1]
assert gotten_guard == expected_guard, (fn, gotten_guard, expected_guard)
def verify_license(_, dir, files):
for bn in files:
fn = os.path.join(dir, bn)
if bn.endswith(".h") or bn.endswith(".cpp"):
s = open(fn).read(1024)
assert "Copyright (c) 2014 Dropbox, Inc." in s, fn
assert "Apache License, Version 2.0" in s, fn
PYSTON_SRC_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "../src"))
PYSTON_SRC_SUBDIRS = [bn for bn in os.listdir(PYSTON_SRC_DIR) if os.path.isdir(os.path.join(PYSTON_SRC_DIR, bn))]
def verify_include_order(_, dir, files):
for bn in files:
fn = os.path.join(dir, bn)
if not bn.endswith(".cpp") and not bn.endswith('.h'):
continue
section = None
sections = []
with open(fn) as f:
for l in f:
l = l.strip()
if l.startswith("//"):
continue
if not l:
if section:
sections.append(section)
section = None
continue
if l.startswith("#include"):
if section is None:
section = []
section.append(l)
continue
if l.startswith("#ifndef PYSTON") or l.startswith("#define PYSTON"):
assert not section
assert not sections
continue
break
def is_corresponding_header(section):
if len(section) != 1:
return False
incl = section[0]
if not incl.endswith('"'):
return False
included = incl.split('"')[1]
return (included[:-1] + "cpp") in fn
def is_system_section(section):
return all(incl.endswith('>') for incl in section)
def is_third_party_section(section):
for incl in section:
if incl.startswith('#include "llvm/'):
continue
if '"opagent.h"' in incl or '"Python.h"' in incl:
continue
return False
return True
def is_pyston_section(section):
# TODO generate this
include_dirs = PYSTON_SRC_SUBDIRS
for incl in section:
if not any(incl.startswith('#include "%s/' % d) for d in include_dirs):
return False
return True
def check_sorted(section):
section = [incl.lower() for incl in section]
if section != list(sorted(section)):
print >>sys.stderr, "The following section is not sorted in %s:" % fn
print >>sys.stderr, '\n'.join(section)
sys.exit(1)
assert len(sections[0]) == len(set(sections[0]))
if sections and is_corresponding_header(sections[0]):
del sections[0]
if sections and is_system_section(sections[0]):
check_sorted(sections[0])
del sections[0]
while sections and is_third_party_section(sections[0]):
check_sorted(sections[0])
del sections[0]
if sections and is_pyston_section(sections[0]):
check_sorted(sections[0])
for incl in sections[0]:
if is_corresponding_header([incl]):
print >>sys.stderr, "Include-order error in %s:" % fn
print >>sys.stderr, "%r should be put first" % incl
sys.exit(1)
del sections[0]
if sections:
print >>sys.stderr, "Include-order error in %s:" % fn
print >>sys.stderr, "Sections not appropriately grouped. Should be:"
print >>sys.stderr, "- Corresponding header"
print >>sys.stderr, "- System headers"
print >>sys.stderr, "- Third party headers"
print >>sys.stderr, "- Pyston headers"
print >>sys.stderr, "There should be an extra line between sections but not within sections"
sys.exit(1)
assert not sections, fn
if __name__ == "__main__":
os.path.walk('.', verify_include, None)
os.path.walk('.', verify_include_order, None)
os.path.walk('.', verify_license, None)
os.path.walk('../tools', verify_license, None)
print "Lint checks passed"
tools/tester.py
View file @ 40636a33
......@@ -274,147 +274,11 @@ def worker_thread():
cv.notifyAll()
# os._exit(-1)
def verify_include(_, dir, files):
for bn in files:
fn = os.path.join(dir, bn)
if not bn.endswith(".h"):
continue
expected_guard = "PYSTON" + fn[1:-2].replace('_', '').replace('/', '_').upper() + "_H"
with open(fn) as f:
while True:
l = f.readline()
if l.startswith('//') or not l.strip():
continue
break
gotten_guard = l.split()[1]
assert gotten_guard == expected_guard, (fn, gotten_guard, expected_guard)
def verify_license(_, dir, files):
for bn in files:
fn = os.path.join(dir, bn)
if bn.endswith(".h") or bn.endswith(".cpp"):
s = open(fn).read(1024)
assert "Copyright (c) 2014 Dropbox, Inc." in s, fn
assert "Apache License, Version 2.0" in s, fn
PYSTON_SRC_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "../src"))
PYSTON_SRC_SUBDIRS = [bn for bn in os.listdir(PYSTON_SRC_DIR) if os.path.isdir(os.path.join(PYSTON_SRC_DIR, bn))]
def verify_include_order(_, dir, files):
for bn in files:
fn = os.path.join(dir, bn)
if not bn.endswith(".cpp") and not bn.endswith('.h'):
continue
section = None
sections = []
with open(fn) as f:
for l in f:
l = l.strip()
if l.startswith("//"):
continue
if not l:
if section:
sections.append(section)
section = None
continue
if l.startswith("#include"):
if section is None:
section = []
section.append(l)
continue
if l.startswith("#ifndef PYSTON") or l.startswith("#define PYSTON"):
assert not section
assert not sections
continue
break
def is_corresponding_header(section):
if len(section) != 1:
return False
incl = section[0]
if not incl.endswith('"'):
return False
included = incl.split('"')[1]
return (included[:-1] + "cpp") in fn
def is_system_section(section):
return all(incl.endswith('>') for incl in section)
def is_third_party_section(section):
for incl in section:
if incl.startswith('#include "llvm/'):
continue
if '"opagent.h"' in incl or '"Python.h"' in incl:
continue
return False
return True
def is_pyston_section(section):
# TODO generate this
include_dirs = PYSTON_SRC_SUBDIRS
for incl in section:
if not any(incl.startswith('#include "%s/' % d) for d in include_dirs):
return False
return True
def check_sorted(section):
section = [incl.lower() for incl in section]
if section != list(sorted(section)):
print >>sys.stderr, "The following section is not sorted in %s:" % fn
print >>sys.stderr, '\n'.join(section)
sys.exit(1)
assert len(sections[0]) == len(set(sections[0]))
if sections and is_corresponding_header(sections[0]):
del sections[0]
if sections and is_system_section(sections[0]):
check_sorted(sections[0])
del sections[0]
while sections and is_third_party_section(sections[0]):
check_sorted(sections[0])
del sections[0]
if sections and is_pyston_section(sections[0]):
check_sorted(sections[0])
for incl in sections[0]:
if is_corresponding_header([incl]):
print >>sys.stderr, "Include-order error in %s:" % fn
print >>sys.stderr, "%r should be put first" % incl
sys.exit(1)
del sections[0]
if sections:
print >>sys.stderr, "Include-order error in %s:" % fn
print >>sys.stderr, "Sections not appropriately grouped. Should be:"
print >>sys.stderr, "- Corresponding header"
print >>sys.stderr, "- System headers"
print >>sys.stderr, "- Third party headers"
print >>sys.stderr, "- Pyston headers"
print >>sys.stderr, "There should be an extra line between sections but not within sections"
sys.exit(1)
assert not sections, fn
def fileSize(fn):
return os.stat(fn).st_size
# return len(list(open(fn)))
if __name__ == "__main__":
os.path.walk('.', verify_include, None)
os.path.walk('.', verify_include_order, None)
os.path.walk('.', verify_license, None)
os.path.walk('../tools', verify_license, None)
print "Include- and license-checks passed"
run_memcheck = False
start = 1
......@@ -495,12 +359,6 @@ if __name__ == "__main__":
FN_JUST_SIZE = max(20, 2 + max(map(len, tests)))
if not TEST_PYPY:
print "Building...",
sys.stdout.flush()
subprocess.check_call(["make", "-j4", IMAGE], stdout=open("/dev/null", 'w'), stderr=subprocess.PIPE)
print "done"
if TEST_PYPY:
IMAGE = '/usr/local/bin/pypy'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7