diff options
author | William Deegan <bill@baddogconsulting.com> | 2018-08-31 03:33:42 (GMT) |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2018-08-31 03:33:42 (GMT) |
commit | 26be7837c6bef1afe1e5b574eaa7f5166629005f (patch) | |
tree | 3bf0db1c1137c288ecc90a94e8c3d8cc1ed07f9c /runtest.py | |
parent | 3de25a92e801acec7afcdb9b563a132ca327327c (diff) | |
download | SCons-26be7837c6bef1afe1e5b574eaa7f5166629005f.zip SCons-26be7837c6bef1afe1e5b574eaa7f5166629005f.tar.gz SCons-26be7837c6bef1afe1e5b574eaa7f5166629005f.tar.bz2 |
More deletion of _JAVA_OPTIONS to runtest.py from travis startup files.
Diffstat (limited to 'runtest.py')
-rwxr-xr-x | runtest.py | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -618,6 +618,10 @@ os.environ['SCONS_VERSION'] = version old_pythonpath = os.environ.get('PYTHONPATH') +# Clear _JAVA_OPTIONS which java tools output to stderr when run breaking tests +if '_JAVA_OPTIONS' in os.environ: + del os.environ['_JAVA_OPTIONS'] + # FIXME: the following is necessary to pull in half of the testing # harness from $srcdir/etc. Those modules should be transfered # to testing/, in which case this manipulation of PYTHONPATH |