diff options
author | Dan Liew <daniel.liew@imperial.ac.uk> | 2014-05-27 19:04:58 +0100 |
---|---|---|
committer | Dan Liew <daniel.liew@imperial.ac.uk> | 2014-05-27 19:04:58 +0100 |
commit | 451c92fde0945e18e12fbcce4f07bc6843118ce3 (patch) | |
tree | 8234984a484d818106985d38b16ddf5b513591a0 /Test/lit.site.cfg | |
parent | 25168d775055ca464bb5cc57120f7caff8924779 (diff) |
Added simple python implementation of diff to replace using the
``fc`` tool on windows because it is buggy when tests are run
concurrently.
Diffstat (limited to 'Test/lit.site.cfg')
-rw-r--r-- | Test/lit.site.cfg | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Test/lit.site.cfg b/Test/lit.site.cfg index 9cd85ef6..e103edde 100644 --- a/Test/lit.site.cfg +++ b/Test/lit.site.cfg @@ -111,13 +111,16 @@ else: lit_config.warning('Skipping solver sanity check on Windows') # Add diff tool substitution +commonDiffFlags=' --unified=3 --strip-trailing-cr --ignore-all-space' diffExecutable = None if os.name == 'posix': - diffExecutable = 'diff --unified=3 --strip-trailing-cr --ignore-all-space' + diffExecutable = 'diff' + commonDiffFlags elif os.name == 'nt': - diffExecutable = 'fc /W' + pydiff = os.path.join(config.test_source_root, 'pydiff.py') + diffExecutable = sys.executable + ' ' + pydiff + commonDiffFlags else: lit_config.fatal('Unsupported platform') +lit_config.note("Using diff tool '{}'".format(diffExecutable)) config.substitutions.append( ('%diff', diffExecutable )) |