diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-10-27 12:15:45 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-10-27 12:15:45 -0400 |
| commit | d89c5f0e1920a455b095208d6b60a64262e83ac3 (patch) | |
| tree | 25b014afbe36c3c8ca046194c59b4627053c408f /scripts | |
| parent | f01d88cdba1a4025b821741402d4681111ba2f82 (diff) | |
| parent | af9f317c251a0a1adfeaad8dd983ab602cf93070 (diff) | |
| download | qtlocation-mapboxgl-d89c5f0e1920a455b095208d6b60a64262e83ac3.tar.gz | |
Merge branch 'master' into mesa
Conflicts:
.travis.yml
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/run_tests.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index 6b42b79911..e107000761 100755 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -10,7 +10,10 @@ for TEST in ./test_* ; do ulimit -c unlimited -S echo 'ulimit -c: '`ulimit -c` echo '/proc/sys/kernel/core_pattern: '`cat /proc/sys/kernel/core_pattern` - sysctl kernel.core_pattern + + if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then + sysctl kernel.core_pattern + fi RESULT=0 ${TEST} || RESULT=$? |