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
3 changes: 2 additions & 1 deletion .github/ciimage/Dockerfile.archlinux
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ RUN pacman -Syu --noconfirm && \
python-pip \
git \
meson \
ninja && \
ninja \
tzdata && \
pacman -Scc --noconfirm

# Set environment variables
Expand Down
8 changes: 4 additions & 4 deletions .github/ciimage/Dockerfile.debian
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use a specific Debian base image
FROM debian:buster
# Use the latest Debian base image
FROM debian:bullseye

# Set environment variables to avoid interaction
ENV DEBIAN_FRONTEND=noninteractive \
Expand Down Expand Up @@ -27,8 +27,8 @@ RUN apt-get update && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

# Install Meson, Ninja, and Cython using pip
RUN python3 -m pip install --no-cache-dir meson==1.4.0 ninja
# Install Meson and Ninja
RUN apt-get update && python3 -m pip install --no-cache-dir meson==1.3.0 ninja==1.10.2

# Set environment variables
ENV CC=/usr/bin/clang
Expand Down
2 changes: 1 addition & 1 deletion .github/ciimage/Dockerfile.fedora
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ ENV TZ=UTC

# Install system dependencies and clean up
RUN dnf -y update && \
dnf -y groupinstall "Development Tools" && \
dnf install -y \
gcc \
gcc-c++ \
Expand All @@ -19,7 +20,6 @@ RUN dnf -y update && \
python3-pip \
git && \
dnf clean all

# Install Meson and Ninja using pip
RUN python3 -m pip install --no-cache-dir meson ninja

Expand Down
4 changes: 2 additions & 2 deletions .github/ciimage/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ RUN apt-get update && \
wget \
python3 \
python3-pip \
git && \
git \
tzdata && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

# Install Meson, Ninja, and Cython using pip
RUN python3 -m pip install --no-cache-dir meson ninja

# Set environment variables
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/meson_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ jobs:

strategy:
matrix:
distro: [ubuntu, debian, fedora, archlinux]
distro: [ubuntu, fedora, archlinux]

steps:
- name: Checkout code
Expand Down
7 changes: 5 additions & 2 deletions code/logic/fossil/test/testing.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ typedef struct {
typedef enum {
TEST_STATUS_PASS,
TEST_STATUS_FAIL,
TEST_STATUS_SKIP
TEST_STATUS_SKIP,
TEST_STATUS_TTIMEOUT
} test_status_t;

// Stack frame structure for tracking function call details during failures
Expand Down Expand Up @@ -94,8 +95,10 @@ typedef struct fossil_test_env {
int pass_count;
int fail_count;
int skip_count;
int timeout_count;
int unexpected_count;
double total_execution_time;
double start_execution_time;
double end_execution_time;
test_suite_t *test_suites;
} fossil_test_env_t;

Expand Down
304 changes: 250 additions & 54 deletions code/logic/testing.c

Large diffs are not rendered by default.