Travis fixes

- Remove trailing semicolons. They're not needed in shell scripts
- Don't create default XDG_DATA_HOME (<HOME>/.local/share) the code
  should work equally well if that directory doesn't exist and so
  not creating it tests another part of the code
This commit is contained in:
Geert Janssens 2017-09-16 21:20:16 +02:00
parent a8cccc00f3
commit 42aa734475
3 changed files with 14 additions and 16 deletions

View File

@ -9,10 +9,10 @@
# Python is python 3, but gnucash doesn't work with python 3. There # Python is python 3, but gnucash doesn't work with python 3. There
# doesn't seem to be a way to tell automake to use /usr/bin/python2, # doesn't seem to be a way to tell automake to use /usr/bin/python2,
# so we'll mock this up # so we'll mock this up
mkdir autotools_bin; mkdir autotools_bin
ln -s /usr/bin/python2 autotools_bin/python; ln -s /usr/bin/python2 autotools_bin/python
export PATH=/autotools_bin:"$PATH"; export PATH=/autotools_bin:"$PATH"
echo path is "$PATH"; echo path is "$PATH"
echo python version is "$(python --version)"; echo python version is "$(python --version)"
../commonbuild ../commonbuild

View File

@ -1,25 +1,23 @@
#!/bin/bash -e #!/bin/bash -e
mkdir build; mkdir build
cd build; cd build
export TZ="America/Los_Angeles"; export TZ="America/Los_Angeles"
#mkdir -p /root/.local/share;
if [[ "$BUILDTYPE" == "cmake-make" ]]; then if [[ "$BUILDTYPE" == "cmake-make" ]]; then
cmake ../gnucash cmake ../gnucash
make -j 4; make -j 4
make check || ../afterfailure; make check || ../afterfailure
elif [[ "$BUILDTYPE" == "cmake-ninja" ]]; then elif [[ "$BUILDTYPE" == "cmake-ninja" ]]; then
cmake ../gnucash -DWITH_PYTHON=ON -DCMAKE_BUILD_TYPE=debug -DENABLE_DEBUG=on -G Ninja cmake ../gnucash -DWITH_PYTHON=ON -DCMAKE_BUILD_TYPE=debug -DENABLE_DEBUG=on -G Ninja
ninja ninja
ninja check || ../afterfailure; ninja check || ../afterfailure;
elif [[ "$BUILDTYPE" == "autotools" ]]; then elif [[ "$BUILDTYPE" == "autotools" ]]; then
../gnucash/autogen.sh; ../gnucash/autogen.sh;
../gnucash/configure --enable-python; ../gnucash/configure --enable-python
make; make;
make check || ../afterfailure; make check || ../afterfailure
else else
echo "Unknown buildtype: \"$BUILDTYPE\". Not building."; echo "Unknown buildtype: \"$BUILDTYPE\". Not building."
fi fi

View File

@ -3,6 +3,6 @@
# -e above so that if any command has an exit code != 0, this script will # -e above so that if any command has an exit code != 0, this script will
# exit immediately. # exit immediately.
export GTEST_ROOT=/gtest/googletest GMOCK_ROOT=/gtest/googlemock; export GTEST_ROOT=/gtest/googletest GMOCK_ROOT=/gtest/googlemock
../commonbuild ../commonbuild