Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
210 changes: 0 additions & 210 deletions .circleci/config.yml

This file was deleted.

7 changes: 0 additions & 7 deletions .circleci/images/32bit/Dockerfile

This file was deleted.

67 changes: 67 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,70 @@ jobs:
verbose: true
flags: python-tests-no-jit

- name: Build example LWT interface code and test
working-directory: python/lwt_interface/
run: |
make allchecks
uv run --project=../ --group=test pytest -vs

- name: Build cython example LWT interface code and run
working-directory: python/lwt_interface/cython_example
run: make


bespoke-c-test:
name: Bespoke C tests
runs-on: ubuntu-24.04

steps:
- name: Cancel Previous Runs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}

- name: Checkout
uses: actions/[email protected]
with:
submodules: true

- name: Install system deps
run: |
sudo apt-get update
sudo apt-get install -y libcunit1-dev ninja-build clang

- name: Install uv
uses: astral-sh/setup-uv@v6
with:
version: "0.10.2"

- name: Install uv deps
run: |
uv tool install meson==1.10.1

- name: Configure code
run: CFLAGS=-D_TSK_BIG_TABLES CPPFLAGS=-D_TSK_BIG_TABLES meson setup build-bt c/

- name: Compile
run: ninja -C build-bt

- name: Run tests
run: ninja -C build-bt test


- name: Test building with meson subproject
run: |
meson build-subproject c/tests/meson-subproject
ninja -C build-subproject
./build-subproject/example

- name: Install shared library and hand-compile program.
run: |
meson build-install c --prefix=/usr
sudo ninja -C build-install install
clang c/examples/api_structure.c -I c/subprojects/kastore -o api_structure -ltskit
./api_structure

- name: Run example make file
run: |
make -C c/examples

2 changes: 1 addition & 1 deletion c/subprojects/kastore/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.1
2.1.2
2 changes: 1 addition & 1 deletion c/subprojects/kastore/kastore.h
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ to the API or ABI are introduced, i.e., the addition of a new function.
The library patch version. Incremented when any changes not relevant to the
to the API or ABI are introduced, i.e., internal refactors of bugfixes.
*/
#define KAS_VERSION_PATCH 1
#define KAS_VERSION_PATCH 2
/** @} */

#define KAS_HEADER_SIZE 64
Expand Down
26 changes: 15 additions & 11 deletions c/subprojects/kastore/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,29 @@ if not meson.is_subproject()
shared_library('kastore', 'kastore.c', install: true)
executable('example', ['example.c'], link_with: kastore)

# Note: we don't declare these as meson tests because they depend on
# being run from the current working directory because of the paths
# to example files.
cunit_dep = dependency('cunit')
executable('tests', ['tests.c', 'kastore.c'], dependencies: cunit_dep,
src_root = meson.project_source_root()

tests_exe = executable('tests', ['tests.c', 'kastore.c'], dependencies: cunit_dep,
c_args: ['-DMESON_VERSION="@0@"'.format(meson.project_version())])
test('tests', tests_exe,
env: ['KAS_TEST_DATA_PREFIX=' + src_root + '/test-data/'])

executable('cpp_tests', ['cpp_tests.cpp'], link_with: kastore)
cpp_tests_exe = executable('cpp_tests', ['cpp_tests.cpp'], link_with: kastore)
test('cpp_tests', cpp_tests_exe)

executable('malloc_tests', ['malloc_tests.c', 'kastore.c'],
dependencies: cunit_dep,
malloc_tests_exe = executable('malloc_tests', ['malloc_tests.c', 'kastore.c'],
dependencies: cunit_dep,
link_args:['-Wl,--wrap=malloc', '-Wl,--wrap=realloc', '-Wl,--wrap=calloc'])
test('malloc_tests', malloc_tests_exe, workdir: src_root)

executable('io_tests', ['io_tests.c', 'kastore.c'],
dependencies: cunit_dep,
io_tests_exe = executable('io_tests', ['io_tests.c', 'kastore.c'],
dependencies: cunit_dep,
link_args:[
'-Wl,--wrap=fwrite',
'-Wl,--wrap=fread',
'-Wl,--wrap=fwrite',
'-Wl,--wrap=fread',
'-Wl,--wrap=fclose',
'-Wl,--wrap=ftell',
'-Wl,--wrap=fseek'])
test('io_tests', io_tests_exe, workdir: src_root)
endif
Loading
Loading