Skip to content

Commit c14acf1

Browse files
authored
Merge pull request #41 from TimWolla/vtest-2.5
Fix tests for HAProxy 2.5
2 parents 7274337 + a747763 commit c14acf1

3 files changed

Lines changed: 17 additions & 0 deletions

File tree

.github/vtest.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "vtest",
5+
"pattern": [
6+
{
7+
"regexp": "^#(\\s+top\\s+TEST\\s+(.*)\\s+FAILED.*)",
8+
"file": 2,
9+
"message": 1
10+
}
11+
]
12+
}
13+
]
14+
}

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,7 @@ jobs:
6363
sudo install -m755 -d /usr/local/share/lua/5.3/
6464
sudo install -m644 haproxy-lua-http/http.lua /usr/local/share/lua/5.3/haproxy-lua-http.lua
6565
sed -i 's/lua-prepend-path/#lua-prepend-path/g' test/*.vtc
66+
- name: Install problem matcher for VTest.
67+
run: echo "::add-matcher::.github/vtest.json"
6668
- name: Run tests using HAProxy ${{ steps.install-haproxy.outputs.version }}.
6769
run: vtest -Dhaproxy_version=${{ steps.install-haproxy.outputs.version }} -k -t 10 test/*.vtc

test/no_variable_leak.vtc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
varnishtest "Verify that we don't leak variables."
44
feature ignore_unknown_macro
55
feature cmd "dpkg --compare-versions ${haproxy_version} ge 2.2"
6+
feature cmd "dpkg --compare-versions ${haproxy_version} lt 2.5-dev6"
67

78
server s1 {
89
rxreq

0 commit comments

Comments
 (0)