Skip to content

feat: fix regression test, add a new CI workflow #3456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: v2/master
Choose a base branch
from
+44 −196
Open

feat: fix regression test, add a new CI workflow #3456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
02da85b
Fix 17th test in 10-request-directives.t
airween Oct 30, 2025
e0883f9
Add regression test to GH workflof
airween Oct 30, 2025
432299c
Add necessary packages
airween Oct 30, 2025
87df298
Reduce number of regression test matrix size
airween Oct 30, 2025
53fba16
Bump OS version to ubuntu-release
airween Oct 30, 2025
b9b4de1
Downgrade OS to ubuntu-24.04, install explicit old PCRE
airween Oct 30, 2025
bbe5239
Try to improve script's performance; removed regression/misc/10-tfn-c…
airween Nov 7, 2025
eb33fc1
Remove buffer cleaning
airween Nov 7, 2025
4aec5bf
Run tests by files
airween Nov 7, 2025
ccec3a7
Add timestamp to DBG output; Run tests in debug mode
airween Nov 7, 2025
f33e2cc
Decrease number of printed dots during match_log execution
airween Nov 8, 2025
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
38 changes: 34 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04]
os: [ubuntu-24.04]
platform: [x32, x64]
compiler: [gcc, clang]
configure:
Expand All @@ -27,7 +27,7 @@ jobs:
- name: Setup Dependencies
run: |
sudo apt-get update -y -qq
sudo apt-get install -y apache2-dev libxml2-dev liblua5.1-0-dev libcurl4-gnutls-dev libpcre2-dev pkg-config libyajl-dev apache2 apache2-bin apache2-data
sudo apt-get install -y apache2-dev libxml2-dev liblua5.1-0-dev libcurl4-gnutls-dev libpcre2-dev libpcre3-dev libpcre3 pkg-config libyajl-dev apache2 apache2-bin apache2-data
- uses: actions/checkout@v2
- name: autogen.sh
run: ./autogen.sh
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04]
os: [ubuntu-24.04]
platform: [x32, x64]
compiler: [gcc, clang]
configure:
Expand All @@ -97,7 +97,7 @@ jobs:
- name: Setup Dependencies
run: |
sudo apt-get update -y -qq
sudo apt-get install -y --no-install-recommends apache2-dev libxml2-dev liblua5.1-0-dev libcurl4-gnutls-dev libpcre2-dev pkg-config libyajl-dev apache2 apache2-bin apache2-data
sudo apt-get install -y --no-install-recommends apache2-dev libxml2-dev liblua5.1-0-dev libcurl4-gnutls-dev libpcre2-dev libpcre3-dev libpcre3 pkg-config libyajl-dev apache2 apache2-bin apache2-data
- uses: actions/checkout@v2
- name: autogen.sh
run: ./autogen.sh
Expand All @@ -110,3 +110,33 @@ jobs:
run: sudo make install
- name: run tests
run: make test

test-regression-linux:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-24.04]
#platform: [x32, x64]
platform: [x64]
#compiler: [gcc, clang]
compiler: [gcc]
configure:
- {label: "with pcre2, with study, with jit", opt: "--enable-pcre-study=yes --enable-pcre-jit" }
#- {label: "with pcre, with study, with jit", opt: "--with-pcre --enable-pcre-study=yes --enable-pcre-jit" }
steps:
- name: Setup Dependencies
run: |
sudo apt-get update -y -qq
sudo apt-get install -y --no-install-recommends apache2-dev libxml2-dev liblua5.1-0-dev libcurl4-gnutls-dev libpcre2-dev libpcre3-dev libpcre3 pkg-config libyajl-dev apache2 apache2-bin apache2-data perl libwww-perl ssdeep libfuzzy-dev libfuzzy2
- uses: actions/checkout@v2
- name: autogen.sh
run: ./autogen.sh
- name: configure ${{ matrix.configure.label }}
run: ./configure ${{ matrix.configure.opt }} 'CFLAGS=-Werror=format-security'
- uses: ammaraskar/gcc-problem-matcher@master
- name: make
run: make -j `nproc`
- name: install module
run: sudo make install
- name: run regression tests
run: cd tests; time for f in `find regression/ -maxdepth 2 -mindepth 2 -name "*.t" | tr "\012" " "`; do time ./run-regression-tests.pl -S . -d ${f}; done
2 changes: 1 addition & 1 deletion tests/regression/config/10-request-directives.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@
SecRequestBodyLimit 20
),
match_log => {
debug => [ qr/Request body is larger than the configured limit \(20\).. Deny with code \(413\)/, 1 ],
debug => [ qr/Request body is larger than the configured limit \(20\)./, 1 ],
},
match_response => {
status => qr/^413$/,
Expand Down
187 changes: 0 additions & 187 deletions tests/regression/misc/10-tfn-cache.t
View file
Open in desktop

This file was deleted.

13 changes: 9 additions & 4 deletions tests/run-regression-tests.pl.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,11 +476,15 @@ sub match_log {
$rc = $&;
last;
}
# TODO: Use select()/poll()
sleep 0.1 unless ($nbytes == $BUFSIZ);
unless ($nbytes == $BUFSIZ) {
# wait until we can read from the file but max 0.1 secs
my $rin = '';
vec($rin, fileno($fh), 1) = 1;
select($rin, undef, undef, 0.1);
}
if ($graph and $opt{d}) {
$i++;
if ($i == 10) {
if ($i == 1000) {
$graphed++;
$i=0;
print STDERR $graph if ($graphed == 1);
Expand Down Expand Up @@ -532,7 +536,8 @@ sub dbg {
my $out = join "", map {
(ref $_ ne "" ? Dumper($_) : $_)
} @_;
$out =~ s/^/DBG: /mg;
my $t = gettimeofday;
$out =~ s/^/DBG\[$t\]: /mg;
print STDOUT "$out\n";
}

Expand Down
Loading