Skip to content

--version: add more details about filecheck #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stanislaw merged 1 commit into from
Dec 13, 2019
Merged

--version: add more details about filecheck #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .bumpversion.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ replace = version = "{new_version}"
search = __version__ = '{current_version}'
replace = __version__ = '{new_version}'

[bumpversion:file:tests/integration/tests/py-only/version/sample.py-itest]
search = Version: {current_version}
replace = Version: {new_version}

1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ test-lit-real: ## Run tests against FileCheck C++.
cd tests/integration && make clean

CURRENT_DIR=$(PWD) \
REAL_ONLY=1 \
FILECHECK_EXEC=$(FILECHECK_REAL_EXEC) \
PATH=$(PWD)/tests/integration/tools/FileCheck:$(PWD)/tests/integration/tools:$$PATH \
lit \
Expand Down
5 changes: 3 additions & 2 deletions filecheck/FileCheck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ def print_help():


def print_version():
print(__version__)

print("filecheck: Python port of LLVM's FileCheck, flexible pattern matching file verifier")
print("https://github.com/stanislaw/FileCheck.py")
print("Version: {}".format(__version__))

def escape_non_regex_or_skip(match_obj):
non_regex = match_obj.group('non_regex')
Expand Down
6 changes: 5 additions & 1 deletion tests/integration/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ config.test_format = lit.formats.ShTest("0")
# https://stackoverflow.com/a/39861848/598057
current_dir = os.environ.get('CURRENT_DIR', '')
filecheck_exec = os.environ.get('FILECHECK_EXEC', '')
real_only = os.environ.get('REAL_ONLY', '')

config.substitutions.append(('%CURRENT_DIR', current_dir))
config.substitutions.append(('%FILECHECK_EXEC', filecheck_exec))
config.substitutions.append(('%COMPARE_EXEC', "{}/tests/integration/tools/compare_dirs".format(current_dir)))
config.substitutions.append(('%FILECHECK_TESTER_EXEC', "{}/tests/integration/tools/FileCheck/FileCheck".format(current_dir)))

config.suffixes = ['.itest']
if real_only:
config.suffixes = ['.itest']
else:
config.suffixes = ['.itest', '.py-itest']
4 changes: 4 additions & 0 deletions tests/integration/tests/py-only/version/sample.py-itest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
; RUN: %FILECHECK_EXEC --version | %FILECHECK_TESTER_EXEC %s --match-full-lines
; CHECK: {{^.*}}FileCheck{{(\.py)?$}}
; CHECK: Version: 0.0.5
; CHECK-EMPTY: