From cbfd93e44069f12949cb5c70162c055c8e9029bc Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Sat, 27 Jul 2019 09:36:01 -0400 Subject: [PATCH] Timeout optimized Python build so we can cache partial testing... --- src/travis/linux-x86_64-before-install.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/travis/linux-x86_64-before-install.sh b/src/travis/linux-x86_64-before-install.sh index 5d5e4a37..080fd13f 100755 --- a/src/travis/linux-x86_64-before-install.sh +++ b/src/travis/linux-x86_64-before-install.sh @@ -66,17 +66,19 @@ else echo "running configure with safe and unsafe" ./configure $safe_flags $unsafe_flags > /dev/null fi - make -j$cpucount -s + timeout 1800 make -j$cpucount -s RESULT=$? echo "First make exited with $RESULT" if [ $RESULT != 0 ]; then - echo "Trying Python compile again without unsafe flags..." - make clean - ./configure $safe_flags > /dev/null - make -j$cpucount -s + #echo "Trying Python compile again without unsafe flags..." + #make clean + #./configure $safe_flags > /dev/null + #make -j$cpucount -s + echo "Sticking with safe Python for now..." + else + echo "Installing optimized Python..." + make install > /dev/null fi - echo "Installing Python..." - make install > /dev/null cd ~ export LD_LIBRARY_PATH=~/ssl/lib:~/python/lib