From 26be7837c6bef1afe1e5b574eaa7f5166629005f Mon Sep 17 00:00:00 2001 From: William Deegan Date: Thu, 30 Aug 2018 20:33:42 -0700 Subject: More deletion of _JAVA_OPTIONS to runtest.py from travis startup files. --- .travis.yml | 1 - .travis/install.sh | 6 +----- runtest.py | 4 ++++ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ee530e..4c4a1f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,6 @@ jobs: python: 3.7 env: - PYVER=37 - - _JAVA_OPTIONS= sudo: required dist: xenial # required for Python 3.7 (travis-ci/travis-ci#9069) diff --git a/.travis/install.sh b/.travis/install.sh index 7cdfaa7..6f2cfe2 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -32,8 +32,4 @@ if [[ "$PYVER" == 27 ]]; then wget https://github.com/swig/swig/archive/rel-3.0.12.tar.gz tar xzf rel-3.0.12.tar.gz cd swig-rel-3.0.12 && ./autogen.sh && ./configure --prefix=/usr && make && sudo make install && cd .. -fi - -# Clear this flag as newer Oracle Java's will echo to stderr any values set in it which breaks several java -# tests -unset _JAVA_OPTIONS \ No newline at end of file +fi \ No newline at end of file diff --git a/runtest.py b/runtest.py index 45ffffc..9ffe374 100755 --- a/runtest.py +++ b/runtest.py @@ -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 -- cgit v0.12