Skip to content

Commit f8dc3ea

Browse files
Merge pull request #30 from dreamer-coding/pr_add_timeout
Pull Request add timeout and fix time
2 parents 54538de + 9c693e2 commit f8dc3ea

File tree

7 files changed

+265
-65
lines changed

7 files changed

+265
-65
lines changed

.github/ciimage/Dockerfile.archlinux

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ RUN pacman -Syu --noconfirm && \
1818
python-pip \
1919
git \
2020
meson \
21-
ninja && \
21+
ninja \
22+
tzdata && \
2223
pacman -Scc --noconfirm
2324

2425
# Set environment variables

.github/ciimage/Dockerfile.debian

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Use a specific Debian base image
2-
FROM debian:buster
1+
# Use the latest Debian base image
2+
FROM debian:bullseye
33

44
# Set environment variables to avoid interaction
55
ENV DEBIAN_FRONTEND=noninteractive \
@@ -27,8 +27,8 @@ RUN apt-get update && \
2727
apt-get clean && \
2828
rm -rf /var/lib/apt/lists/*
2929

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

3333
# Set environment variables
3434
ENV CC=/usr/bin/clang

.github/ciimage/Dockerfile.fedora

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ ENV TZ=UTC
66

77
# Install system dependencies and clean up
88
RUN dnf -y update && \
9+
dnf -y groupinstall "Development Tools" && \
910
dnf install -y \
1011
gcc \
1112
gcc-c++ \
@@ -19,7 +20,6 @@ RUN dnf -y update && \
1920
python3-pip \
2021
git && \
2122
dnf clean all
22-
2323
# Install Meson and Ninja using pip
2424
RUN python3 -m pip install --no-cache-dir meson ninja
2525

.github/ciimage/Dockerfile.ubuntu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ RUN apt-get update && \
2424
wget \
2525
python3 \
2626
python3-pip \
27-
git && \
27+
git \
28+
tzdata && \
2829
apt-get clean && \
2930
rm -rf /var/lib/apt/lists/*
3031

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

3434
# Set environment variables

.github/workflows/meson_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ jobs:
217217

218218
strategy:
219219
matrix:
220-
distro: [ubuntu, debian, fedora, archlinux]
220+
distro: [ubuntu, fedora, archlinux]
221221

222222
steps:
223223
- name: Checkout code

code/logic/fossil/test/testing.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ typedef struct {
5353
typedef enum {
5454
TEST_STATUS_PASS,
5555
TEST_STATUS_FAIL,
56-
TEST_STATUS_SKIP
56+
TEST_STATUS_SKIP,
57+
TEST_STATUS_TTIMEOUT
5758
} test_status_t;
5859

5960
// Stack frame structure for tracking function call details during failures
@@ -94,8 +95,10 @@ typedef struct fossil_test_env {
9495
int pass_count;
9596
int fail_count;
9697
int skip_count;
98+
int timeout_count;
9799
int unexpected_count;
98-
double total_execution_time;
100+
double start_execution_time;
101+
double end_execution_time;
99102
test_suite_t *test_suites;
100103
} fossil_test_env_t;
101104

code/logic/testing.c

Lines changed: 250 additions & 54 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)