jsreport: return error if file not open. add scan-build to travis

This commit is contained in:
Enno Rehling 2015-07-06 20:44:47 +02:00
parent ef4052b0f6
commit 09db2fe278
3 changed files with 7 additions and 6 deletions

View file

@ -2,10 +2,12 @@ language: c
compiler: compiler:
- gcc - gcc
- clang - clang
script: s/travis-build
before_install: before_install:
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install -qq zlib1g-dev libtolua-dev liblua5.1-dev libncurses5-dev libsqlite3-dev libxml2-dev valgrind install:
- sudo apt-get install -qq zlib1g-dev libtolua-dev liblua5.1-dev libncurses5-dev libsqlite3-dev libxml2-dev valgrind clang
script:
- s/travis-build
os: os:
- linux - linux
- osx - osx

View file

@ -4,9 +4,8 @@ set -e
ROOT=`pwd` ROOT=`pwd`
SUPP=../share/ubuntu-12_04.supp SUPP=../share/ubuntu-12_04.supp
MACHINE=`uname -m` MACHINE=`uname -m`
[ -z "$CC" ] && [ ! -z `which clang` ] && CC="clang"
[ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc" [ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc"
[ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc"
[ -z "$CC" ] && [ ! -z `which cc` ] && CC="cc"
BUILD="$ROOT/build-$MACHINE-$CC-Debug" BUILD="$ROOT/build-$MACHINE-$CC-Debug"
inifile() { inifile() {
@ -20,7 +19,7 @@ fi
build() { build() {
cd $BUILD cd $BUILD
cmake -DCMAKE_MODULE_PATH=$ROOT/cmake/Modules -DCMAKE_BUILD_TYPE=Debug .. cmake -DCMAKE_MODULE_PATH=$ROOT/cmake/Modules -DCMAKE_BUILD_TYPE=Debug ..
make scan-build make
} }
test_valgrind_report () { test_valgrind_report () {

View file

@ -74,7 +74,7 @@ static int report_json(const char *filename, report_context * ctx, const char *c
} }
return 0; return 0;
} }
return errno; return -1;
} }
return 0; return 0;
} }