diff --git a/.travis.yml b/.travis.yml index 78a7fa8e..1d1f3c73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,8 +97,8 @@ before_install: script: # `--coverage` flags required to generate coverage info for Coveralls - - python $BOOST/libs/$PROJECT_TO_TEST/filter_section_warning.py ../../../b2 with-valgrind address-model=64 architecture=x86 testing.launcher=valgrind valgrind=on toolset=$TOOLSET cxxflags="--coverage -DBOOST_TRAVISCI_BUILD -std=$CXX_STANDARD" linkflags=$LDFLAGS -sBOOST_BUILD_PATH=. - - python $BOOST/libs/$PROJECT_TO_TEST/filter_section_warning.py ../../../b2 without-valgrind address-model=64 architecture=x86 toolset=$TOOLSET cxxflags="--coverage -DBOOST_TRAVISCI_BUILD -std=$CXX_STANDARD" linkflags=$LDFLAGS -sBOOST_BUILD_PATH=. + - ../../../b2 with-valgrind address-model=64 architecture=x86 testing.launcher=valgrind valgrind=on toolset=$TOOLSET cxxflags="--coverage -DBOOST_TRAVISCI_BUILD -std=$CXX_STANDARD" linkflags=$LDFLAGS -sBOOST_BUILD_PATH=. > >(python $BOOST/libs/$PROJECT_TO_TEST/filter_section_warning.py) + - ../../../b2 without-valgrind address-model=64 architecture=x86 toolset=$TOOLSET cxxflags="--coverage -DBOOST_TRAVISCI_BUILD -std=$CXX_STANDARD" linkflags=$LDFLAGS -sBOOST_BUILD_PATH=. > >(python $BOOST/libs/$PROJECT_TO_TEST/filter_section_warning.py) after_success: # Copying Coveralls data to a separate folder - mkdir -p $TRAVIS_BUILD_DIR/coverals diff --git a/filter_section_warning.py b/filter_section_warning.py index f0174d49..a03eea17 100644 --- a/filter_section_warning.py +++ b/filter_section_warning.py @@ -2,13 +2,8 @@ # import sys -import subprocess -b2 = subprocess.Popen(sys.argv[1:], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True) - -while not b2.returncode: - line = b2.stdout.readline() - if not line: break; +for line in sys.stdin: # If line is a 'noisy' warning, don't print it or the following two lines. if ('warning: section' in line and 'is deprecated' in line or 'note: change section name to' in line): @@ -16,6 +11,4 @@ while not b2.returncode: next(sys.stdin) else: sys.stdout.write(line) - sys.stdout.flush() - -exit(b2.returncode) \ No newline at end of file + sys.stdout.flush() \ No newline at end of file