Merge pull request #704 from kmod/travis_additions

travis-ci fixes

.travis.yml

@@ -6,22 +6,22 @@ compiler:
 
 env:
   matrix:
-    - TRAVIS_BUILD_TYPE=Debug
-    - TRAVIS_BUILD_TYPE=Release
+    - TRAVIS_BUILD_TYPE=Debug CCACHE_DIR=$HOME/.ccache_debug
+    - TRAVIS_BUILD_TYPE=Release CCACHE_DIR=$HOME/.ccache_release
   global:
     - PYSTON_RUN_ARGS=G
 
 matrix:
   exclude:
     - compiler: gcc
-      env: TRAVIS_BUILD_TYPE=Debug
+      env: TRAVIS_BUILD_TYPE=Debug CCACHE_DIR=$HOME/.ccache_debug
 
 # use travis-ci docker based infrastructure
 sudo: false
 
 cache:
   directories:
-    - $HOME/.ccache
+    - ${CCACHE_DIR}
 
 addons:
   apt:
@@ -51,6 +51,7 @@ addons:
 before_install:
   - if [ "$CC" = "clang" ]; then export CC="clang-3.5" CXX="clang++-3.5"; fi
   - if [ "$CC" = "gcc" ]; then export CC="gcc-4.8" CXX="g++-4.8"; fi
+  - $CXX --version
 
 install:
   - git clone git://github.com/llvm-mirror/llvm.git ~/pyston_deps/llvm-trunk

CMakeLists.txt

@@ -252,9 +252,9 @@ endmacro()
 
 # tests         testname directory arguments
 add_pyston_test(defaults tests --order-by-mtime)
-add_pyston_test(old_parser tests -a=-n -a=-x)
+add_pyston_test(old_parser tests -a=-n -a=-x -t50)
 if(${CMAKE_BUILD_TYPE} STREQUAL "Release")
-  add_pyston_test(max_compilation_tier tests -a=-O -a=-x)
+  add_pyston_test(max_compilation_tier tests -a=-O -a=-x -t50)
 endif()
 add_pyston_test(defaults cpython --exit-code-only --skip-failing -t50)
 add_pyston_test(defaults integration --exit-code-only --skip-failing -t600)

Makefile

@@ -81,8 +81,8 @@ else
 endif
 
 TOOLS_DIR := ./tools
-TEST_DIR := ./test
-TESTS_DIR := ./test/tests
+TEST_DIR := $(abspath ./test)
+TESTS_DIR := $(abspath ./test/tests)
 
 GPP := $(GCC_DIR)/bin/g++
 GCC := $(GCC_DIR)/bin/gcc

src/core/thread_utils.h

@@ -151,6 +151,9 @@ private:
 
     struct Storage {
         PerThreadSet<T, CtorArgs...>* self;
+#ifndef NDEBUG
+        pthread_t my_tid;
+#endif
         T val;
     };
 
@@ -164,6 +167,8 @@ private:
         auto* self = s->self;
         LOCK_REGION(&self->lock);
 
+        assert(s->my_tid == pthread_self());
+
         // I assume this destructor gets called on the same thread
         // that this data is bound to:
         assert(self->map.count(pthread_self()));
@@ -173,7 +178,11 @@ private:
     }
 
     template <int... S> Storage* make(impl::seq<S...>) {
-        return new Storage{.self = this, .val = T(std::get<S>(ctor_args)...) };
+        return new Storage{.self = this,
+#ifndef NDEBUG
+                           .my_tid = pthread_self(),
+#endif
+                           .val = T(std::get<S>(ctor_args)...) };
     }
 
 public:

src/jit.cpp

@@ -155,8 +155,16 @@ static void enableGdbSegfaultWatcher() {
                 int rtncode = 0;
                 if (WIFEXITED(status))
                     rtncode = WEXITSTATUS(status);
-                else
-                    rtncode = 128 + WTERMSIG(status);
+                else {
+                    int from_signal = WTERMSIG(status);
+
+                    // Try to die in the same way that the child did:
+                    signal(from_signal, SIG_DFL);
+                    raise(from_signal);
+
+                    // If somehow that didn't work, fall back to this:
+                    exit(128 + from_signal);
+                }
 
                 exit(rtncode);
             }