diff options
| -rw-r--r-- | .gitlab-ci/meson-prep.sh | 36 | ||||
| -rwxr-xr-x | .gitlab-ci/meson-test.sh | 12 |
2 files changed, 0 insertions, 48 deletions
diff --git a/.gitlab-ci/meson-prep.sh b/.gitlab-ci/meson-prep.sh deleted file mode 100644 index e2630fe8..00000000 --- a/.gitlab-ci/meson-prep.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash - -set -x -if [[ -f .meson_environment ]]; then - . .meson_environment -fi - -if [[ -z "$MESON_BUILDDIR" ]]; then - echo "\$MESON_BUILDDIR undefined." - exit 1 -fi - -# emulate a few gitlab variables to make it easier to -# run and debug locally. -if [[ -z "$CI_JOB_ID" ]] || [[ -z "$CI_JOB_NAME" ]]; then - echo "Missing \$CI_JOB_ID or \$CI_JOB_NAME". - CI_JOB_ID=$(date +%s) - CI_JOB_NAME='libinput-job-local' - echo "Simulating gitlab environment: " - echo " CI_JOB_ID=$CI_JOB_ID" - echo " CI_JOB_NAME=$CI_JOB_NAME" -fi - -if [[ -n "$FDO_CI_CONCURRENT" ]]; then - NINJA_ARGS="-j$FDO_CI_CONCURRENT $NINJA_ARGS" - MESON_TESTTHREADS="$FDO_CI_CONCURRENT" -fi - -echo "*************************************************" -echo "builddir: $MESON_BUILDDIR" -echo "meson args: $MESON_ARGS" -echo "ninja args: $NINJA_ARGS" -echo "meson test args: $MESON_TEST_ARGS" -echo "*************************************************" - -set -e diff --git a/.gitlab-ci/meson-test.sh b/.gitlab-ci/meson-test.sh deleted file mode 100755 index ef72dfba..00000000 --- a/.gitlab-ci/meson-test.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -DIR="${BASH_SOURCE%/*}" -if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi -. $DIR/meson-prep.sh - -if [[ -z "$MESON_TEST_ARGS" ]]; then - echo "\$MESON_TEST_ARGS undefined." - exit 1 -fi - -meson test -C "$MESON_BUILDDIR" $MESON_TEST_ARGS --print-errorlogs |