diff --git a/.travis.sh b/.travis.sh index 6cdd722c..b5946545 100755 --- a/.travis.sh +++ b/.travis.sh @@ -41,21 +41,21 @@ cd expat ./buildconf.sh if [[ ${MODE} = distcheck ]]; then - ./configure + ./configure ${CONFIGURE_ARGS} make distcheck mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} ln -v -s "$PWD"/expat-*.tar.bz2 ~/rpmbuild/SOURCES/ rpmbuild -ba expat.spec elif [[ ${MODE} = cmake ]]; then - cmake . + cmake ${CMAKE_ARGS} . make all test make DESTDIR="${PWD}"/ROOT install find ROOT -printf "%P\n" | sort elif [[ ${MODE} = cmake-oos ]]; then mkdir build cd build - cmake .. + cmake ${CMAKE_ARGS} .. make all test make DESTDIR="${PWD}"/ROOT install find ROOT -printf "%P\n" | sort diff --git a/.travis.yml b/.travis.yml index 98902ded..996290e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,14 @@ env: matrix: include: + - os: linux + env: MODE=cmake CMAKE_ARGS=-DXML_ATTR_INFO=ON + - os: linux + env: MODE=cmake-oos CMAKE_ARGS=-DXML_ATTR_INFO=ON + - os: linux + env: MODE=distcheck CONFIGURE_ARGS=--enable-xml-attr-info + - os: linux + env: MODE=qa-sh QA_COMPILER=clang CC=clang CXX=clang++ LD=clang++ QA_SANITIZER=address CONFIGURE_ARGS=--enable-xml-attr-info - os: linux env: MODE=qa-sh QA_COMPILER=clang CC=clang CXX=clang++ LD=clang++ QA_SANITIZER=memory - os: linux