From 722510b73d783a64ce6f69b883daa312936d9eea Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 3 Jun 2020 21:59:32 +0200 Subject: [PATCH] Squashed 'shared/c-list/' changes from 2e4b605c6217..ac7c83139821 ac7c83139821 ci: switch to c-util automation 6c53ef1c0066 ci: switch to github-actions b1cd4dbf967d Fix assignment instead of comparison 50e67beedbd9 ci: drop broken armv7hl git-subtree-dir: shared/c-list git-subtree-split: ac7c831398219acd8d63038e866035a6f86f9e21 --- .cherryci/ci-test | 12 ------------ .github/workflows/ci.yml | 21 +++++++++++++++++++++ .travis.yml | 21 --------------------- src/test-basic.c | 8 ++++---- 4 files changed, 25 insertions(+), 37 deletions(-) delete mode 100755 .cherryci/ci-test create mode 100644 .github/workflows/ci.yml delete mode 100644 .travis.yml diff --git a/.cherryci/ci-test b/.cherryci/ci-test deleted file mode 100755 index 8ce5f5f70e..0000000000 --- a/.cherryci/ci-test +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -e - -rm -Rf "./ci-build" -mkdir "./ci-build" -cd "./ci-build" - -${CHERRY_LIB_MESONSETUP} . "${CHERRY_LIB_SRCDIR}" -${CHERRY_LIB_NINJABUILD} -${CHERRY_LIB_MESONTEST} -(( ! CHERRY_LIB_VALGRIND )) || ${CHERRY_LIB_MESONTEST} "--wrapper=${CHERRY_LIB_VALGRINDWRAP}" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000000..b40abf690f --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,21 @@ +name: Continuous Integration + +on: + push: + pull_request: + schedule: + - cron: '0 0 * * *' + +jobs: + ci: + name: CI with Default Configuration + runs-on: ubuntu-latest + + steps: + - name: Fetch Sources + uses: actions/checkout@v2 + - name: Run through C-Util CI + uses: c-util/automation/src/ci-c-util@v1 + with: + m32: 1 + valgrind: 1 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 99a7bb9461..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -os: linux -dist: trusty -language: c - -services: - - docker - -before_install: - - curl -O -L "https://raw.githubusercontent.com/cherry-pick/cherry-images/v1/scripts/vmrun" - - curl -O -L "https://raw.githubusercontent.com/cherry-pick/cherry-ci/v1/scripts/cherryci" - - chmod +x "./vmrun" "./cherryci" - -jobs: - include: - - stage: test - script: - - ./vmrun -- ../src/cherryci -d ../src/.cherryci -s c-util -m - - script: - - ./vmrun -T armv7hl -- ../src/cherryci -d ../src/.cherryci -s c-util - - script: - - ./vmrun -T i686 -- ../src/cherryci -d ../src/.cherryci -s c-util diff --git a/src/test-basic.c b/src/test-basic.c index 702f96a651..e68af18062 100644 --- a/src/test-basic.c +++ b/src/test-basic.c @@ -125,15 +125,15 @@ static void test_swap(void) { assert(c_list_first(&list1) == &list); assert(c_list_last(&list1) == &list); - assert(list.next = &list1); - assert(list.prev = &list1); + assert(list.next == &list1); + assert(list.prev == &list1); c_list_swap(&list1, &list2); assert(c_list_first(&list2) == &list); assert(c_list_last(&list2) == &list); - assert(list.next = &list2); - assert(list.prev = &list2); + assert(list.next == &list2); + assert(list.prev == &list2); assert(list1.prev == list1.next && list1.prev == &list1); }