diff --git a/util/ci/arch-testscript b/util/ci/arch-testscript index b97021d9b7..b993a13e44 100644 --- a/util/ci/arch-testscript +++ b/util/ci/arch-testscript @@ -9,10 +9,10 @@ # 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, # so we'll mock this up -mkdir autotools_bin; -ln -s /usr/bin/python2 autotools_bin/python; -export PATH=/autotools_bin:"$PATH"; -echo path is "$PATH"; -echo python version is "$(python --version)"; +mkdir autotools_bin +ln -s /usr/bin/python2 autotools_bin/python +export PATH=/autotools_bin:"$PATH" +echo path is "$PATH" +echo python version is "$(python --version)" ../commonbuild diff --git a/util/ci/commonbuild b/util/ci/commonbuild index 07d13d0da7..526f724c56 100644 --- a/util/ci/commonbuild +++ b/util/ci/commonbuild @@ -1,25 +1,23 @@ #!/bin/bash -e -mkdir build; -cd build; -export TZ="America/Los_Angeles"; - -#mkdir -p /root/.local/share; +mkdir build +cd build +export TZ="America/Los_Angeles" if [[ "$BUILDTYPE" == "cmake-make" ]]; then cmake ../gnucash - make -j 4; - make check || ../afterfailure; + make -j 4 + make check || ../afterfailure elif [[ "$BUILDTYPE" == "cmake-ninja" ]]; then cmake ../gnucash -DWITH_PYTHON=ON -DCMAKE_BUILD_TYPE=debug -DENABLE_DEBUG=on -G Ninja ninja ninja check || ../afterfailure; elif [[ "$BUILDTYPE" == "autotools" ]]; then ../gnucash/autogen.sh; - ../gnucash/configure --enable-python; + ../gnucash/configure --enable-python make; - make check || ../afterfailure; + make check || ../afterfailure else - echo "Unknown buildtype: \"$BUILDTYPE\". Not building."; + echo "Unknown buildtype: \"$BUILDTYPE\". Not building." fi diff --git a/util/ci/ubuntu-14.04-testscript b/util/ci/ubuntu-14.04-testscript index a5fe7aa383..15826881f9 100644 --- a/util/ci/ubuntu-14.04-testscript +++ b/util/ci/ubuntu-14.04-testscript @@ -3,6 +3,6 @@ # -e above so that if any command has an exit code != 0, this script will # exit immediately. -export GTEST_ROOT=/gtest/googletest GMOCK_ROOT=/gtest/googlemock; +export GTEST_ROOT=/gtest/googletest GMOCK_ROOT=/gtest/googlemock ../commonbuild