Skip to content

Commit 2add0a5

Browse files
committed
Update the config file nginx version to one that supports PCRE2
1 parent 8714996 commit 2add0a5

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

tests/test-config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
-n https://github.com/nginx/nginx.git@branches/stable-1.12
1+
-n https://github.com/nginx/nginx.git@release-1.21.5
22
-o "--with-http_stub_status_module"
33
-d https://github.com/PCRE2Project/pcre2.git@pcre2-10.40

tests/tests.bats

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
}
8686

8787
@test "build with older PCRE 1 library" {
88+
# skip
8889
builddir="$(mktemp -d)"
8990
run ./build-nginx -s "$builddir" -d https://ftp.exim.org/pub/pcre/pcre-8.44.tar.gz
9091
[ $status -eq 0 ]
@@ -153,7 +154,7 @@
153154
builddir="$HOME/.build-nginx"
154155
run ./build-nginx -k tests/test-config
155156
[ $status -eq 0 ]
156-
run "$builddir/nginx-branches/stable-1.12/objs/nginx" -V
157+
run "$builddir/nginx-release-1.21.5/objs/nginx" -V
157158
[[ "$output" =~ "--with-http_stub_status_module" ]]
158159
[[ "$output" =~ "--with-pcre" ]]
159160
}
@@ -164,8 +165,8 @@
164165
run ./build-nginx -s "$builddir" -k tests/test-config -m https://github.com/jaygooby/build-nginx.git@hello-world-module
165166
[ $status -eq 0 ]
166167
[[ "$output" =~ "objs/addon/build-nginx-hello-world-module/ngx_http_hello_world_module.o" ]]
167-
run "$builddir/nginx-branches/stable-1.12/objs/nginx" -V
168-
[[ "$output" =~ "nginx version: nginx/1.12" ]]
168+
run "$builddir/nginx-release-1.21.5/objs/nginx" -V
169+
[[ "$output" =~ "nginx version: nginx/1.21.5" ]]
169170
[[ "$output" =~ "--with-http_stub_status_module" ]]
170171
[[ "$output" =~ "--with-pcre" ]]
171172
}

0 commit comments

Comments
 (0)