diff --git a/.ci-scripts/build-osx.sh b/.ci-scripts/build-osx.sh index 5bcf7a13c..f78ba048e 100755 --- a/.ci-scripts/build-osx.sh +++ b/.ci-scripts/build-osx.sh @@ -20,14 +20,6 @@ set -eu -o pipefail readonly BIN_NAME="qTox.dmg" -while (( $# > 0 )); do - case $1 in - --run-tests) RUN_TESTS=1; shift ;; - --online-tests) ONLINE_TESTS=1; shift ;; - *) echo "Unexpected argument $1"; exit 1 ;; - esac -done - build_qtox() { cmake -DUPDATE_CHECK=ON \ -DSPELL_CHECK=OFF \ @@ -35,14 +27,8 @@ build_qtox() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH="$(brew --prefix qt@5)" . make -j$(sysctl -n hw.ncpu) - if [ ! -z ${RUN_TESTS+x} ]; then - EXCLUDE_TESTS="" - if [ -z ${ONLINE_TESTS+x} ]; then - EXCLUDE_TESTS="-E core" - fi - export CTEST_OUTPUT_ON_FAILURE=1 - ctest ${EXCLUDE_TESTS} -j$(sysctl -n hw.ncpu) - fi + export CTEST_OUTPUT_ON_FAILURE=1 + ctest -j$(sysctl -n hw.ncpu) make install } diff --git a/.ci-scripts/build-qtox-linux.sh b/.ci-scripts/build-qtox-linux.sh index cd08519c7..51cf5e3fb 100755 --- a/.ci-scripts/build-qtox-linux.sh +++ b/.ci-scripts/build-qtox-linux.sh @@ -28,7 +28,6 @@ while (( $# > 0 )); do --minimal) MINIMAL=1 ; shift ;; --full) MINIMAL=0; shift ;; --sanitize) SANITIZE=1; shift ;; - --online-tests) ONLINE_TESTS=1; shift ;; --build-type) BUILD_TYPE=$2; shift 2 ;; --help|-h) usage; exit 1 ;; *) echo "Unexpected argument $1"; usage; exit 1 ;; @@ -72,10 +71,5 @@ else $SANITIZE_ARGS fi -EXCLUDE_TESTS="" -if [ -z ${ONLINE_TESTS+x} ]; then - EXCLUDE_TESTS="-E core" -fi - cmake --build . -- -j $(nproc) -ctest ${EXCLUDE_TESTS} -j$(nproc) +ctest -j$(nproc) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index 5fa44564f..cab6e5a91 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -123,7 +123,7 @@ jobs: with: docker_image_name: fedora - name: Run build - run: docker-compose run --rm fedora ./.ci-scripts/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} --sanitize --online-tests + run: docker-compose run --rm fedora ./.ci-scripts/build-qtox-linux.sh --build-type ${{ matrix.build_type }} --${{ matrix.features }} --sanitize build-opensuse: name: Opensuse runs-on: ubuntu-latest @@ -501,7 +501,7 @@ jobs: - name: Install toxcore and toxext run: buildscripts/build_toxcore_linux.sh - name: Build qTox - run: ./.ci-scripts/build-osx.sh --run-tests + run: ./.ci-scripts/build-osx.sh - name: Upload dmg uses: actions/upload-artifact@v2 with: diff --git a/windows/cross-compile/build.sh b/windows/cross-compile/build.sh index b00dd3dc0..e6b149967 100755 --- a/windows/cross-compile/build.sh +++ b/windows/cross-compile/build.sh @@ -37,7 +37,6 @@ while (( $# > 0 )); do --src-dir) QTOX_SRC_DIR=$2; shift 2 ;; --arch) ARCH=$2; shift 2 ;; --run-tests) RUN_TESTS=1; shift ;; - --online-tests) ONLINE_TESTS=1; shift ;; --build-type) BUILD_TYPE=$2; shift 2;; *) "Unexpected argument $1"; exit 1 ;; esac @@ -117,11 +116,7 @@ then export WINEPATH='/export;/windows/bin' export CTEST_OUTPUT_ON_FAILURE=1 export PATH="$PATH:/opt/wine-stable/bin" - EXCLUDE_TESTS="" - if [ -z ${ONLINE_TESTS+x} ]; then - EXCLUDE_TESTS="-E core" - fi - ctest ${EXCLUDE_TESTS} -j$(nproc) + ctest -j$(nproc) fi set -u