diff --git a/shared/c-list/.cherryci/ci-test b/shared/c-list/.cherryci/ci-test deleted file mode 100755 index 8ce5f5f70e..0000000000 --- a/shared/c-list/.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/shared/c-list/.github/workflows/ci.yml b/shared/c-list/.github/workflows/ci.yml new file mode 100644 index 0000000000..b40abf690f --- /dev/null +++ b/shared/c-list/.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/shared/c-list/.travis.yml b/shared/c-list/.travis.yml deleted file mode 100644 index 99a7bb9461..0000000000 --- a/shared/c-list/.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/shared/c-list/meson.build b/shared/c-list/meson.build index 57f6b8ff37..66504a29e4 100644 --- a/shared/c-list/meson.build +++ b/shared/c-list/meson.build @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: LGPL-2.1+ - project( 'c-list', 'c', diff --git a/shared/c-list/src/meson.build b/shared/c-list/src/meson.build index 52d6d2aa68..0261ae0c2f 100644 --- a/shared/c-list/src/meson.build +++ b/shared/c-list/src/meson.build @@ -1,5 +1,3 @@ -# SPDX-License-Identifier: LGPL-2.1+ - # # target: libclist.so # (No .so is built so far, since we are header-only. This might change in the diff --git a/shared/c-list/src/test-basic.c b/shared/c-list/src/test-basic.c index 702f96a651..e68af18062 100644 --- a/shared/c-list/src/test-basic.c +++ b/shared/c-list/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); }