aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2017-04-19 19:51:02 +0200
committerJakub Jirutka <jakub@jirutka.cz>2017-04-19 19:52:26 +0200
commit4fe3572a6a6b99d89b24c76119c47b6acb6e0b19 (patch)
tree8fbbbc75ff2e16691e4aff7ecf3bbc492e28185c
parentb69772b64fc879fff81e417ef870c075c20b498e (diff)
downloadaports-4fe3572a6a6b99d89b24c76119c47b6acb6e0b19.tar.bz2
aports-4fe3572a6a6b99d89b24c76119c47b6acb6e0b19.tar.xz
main/nginx: run nginx-tests in check phase
-rw-r--r--main/nginx/APKBUILD42
1 files changed, 14 insertions, 28 deletions
diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD
index ec0dcb22d8..b83d1d9010 100644
--- a/main/nginx/APKBUILD
+++ b/main/nginx/APKBUILD
@@ -11,6 +11,10 @@ url="http://www.nginx.org/en"
arch="all"
license="custom"
+# Revision of nginx-tests to use for check().
+_tests_hgrev=cdd44ff602db
+_tests_dir="$srcdir/nginx-tests-$_tests_hgrev"
+
# Modules
_devel_kit_name=ngx_devel_kit
_devel_kit_ver=0.3.0
@@ -62,6 +66,8 @@ _rtmp_provides="$pkgname-rtmp" # for backward compatibility
depends=""
makedepends="linux-headers gd-dev geoip-dev libxml2-dev libxslt-dev
libressl-dev paxmark pcre-dev perl-dev pkgconf zlib-dev"
+checkdepends="perl perl-fcgi perl-io-socket-ssl perl-net-ssleay
+ perl-protocol-websocket uwsgi"
pkgusers="nginx"
_grp_ngx="nginx"
_grp_www="www-data"
@@ -70,6 +76,7 @@ install="$pkgname.pre-install $pkgname.post-upgrade"
subpackages="$pkgname-doc $pkgname-vim::noarch"
replaces="$pkgname-common $pkgname-initscripts $pkgname-lua $pkgname-rtmp"
source="http://nginx.org/download/$pkgname-$pkgver.tar.gz
+ $pkgname-tests-$_tests_hgrev.tar.gz::http://hg.nginx.org/nginx-tests/archive/$_tests_hgrev.tar.gz
$_devel_kit_name-$_devel_kit_ver.tar.gz::$_devel_kit_url/archive/v$_devel_kit_ver.tar.gz
$_http_echo_name-$_http_echo_ver.tar.gz::$_http_echo_url/archive/v$_http_echo_ver.tar.gz
$_http_fancyindex_name-$_http_fancyindex_ver.tar.gz::$_http_fancyindex_url/archive/v$_http_fancyindex_ver.tar.gz
@@ -176,6 +183,12 @@ build() {
make || return 1
}
+check() {
+ cd "$_tests_dir"
+
+ TEST_NGINX_BINARY="$builddir/objs/nginx" prove .
+}
+
package() {
cd "$builddir"
@@ -248,35 +261,8 @@ _module() {
echo "load_module \"modules/$soname\";" > ./etc/nginx/modules/$name.conf
}
-md5sums="204a20cb4f0b0c9db746c630d89ff4ea nginx-1.10.3.tar.gz
-76c503918c003fcc55005b7688f47add ngx_devel_kit-0.3.0.tar.gz
-897338c2c4bc44f2d56ae06ab9820372 echo-nginx-module-0.60.tar.gz
-e1dd79f0ec82415bbf8a1cb938988955 ngx-fancyindex-0.4.1.tar.gz
-5ce112f12afe155749e2c504997861f7 headers-more-nginx-module-0.32.tar.gz
-6eb0161f495bb996af6bbb58f3cef764 lua-nginx-module-0.10.7.tar.gz
-fbe5a95878ff4365435fd3223256f830 nchan-1.1.0.tar.gz
-7c1a399d36a75bcfa874d98b5462fc09 nginx-upload-progress-module-0.9.2.tar.gz
-2e82501ed423a901ab64bfe2228a0666 nginx-rtmp-module-1.1.10.tar.gz
-256145c0f70d1d1d3b99f854553d48f0 nginx.conf
-c4759cd2812220ab542317f54fbbe755 default.conf
-db194cf3c6c4be12c70c757e0c9ad995 nginx.logrotate
-16dcac0d7a2b406807d3377841d9b480 nginx.initd
-801a87f7f9d27f8ad85b41a78b4c4461 ipv6.patch"
-sha256sums="75020f1364cac459cb733c4e1caed2d00376e40ea05588fb8793076a4c69dd90 nginx-1.10.3.tar.gz
-88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619 ngx_devel_kit-0.3.0.tar.gz
-1077da2229ac7d0a0215e9e6817e297c10697e095010d88f1adbd1add1ce9f4e echo-nginx-module-0.60.tar.gz
-2b00d8e0ad2a67152a9cee7b7ee67990c742d501412df912baaf1eee9bb6dc71 ngx-fancyindex-0.4.1.tar.gz
-c6d9dab8ea1fc997031007e2e8f47cced01417e203cd88d53a9fe9f6ae138720 headers-more-nginx-module-0.32.tar.gz
-c21c8937dcdd6fc2b6a955f929e3f4d1388610f47180e60126e6dcab06786f77 lua-nginx-module-0.10.7.tar.gz
-5781349bb460cf96d43e835a7ad3109724fba9ccefdbd967552538edee79c722 nchan-1.1.0.tar.gz
-b286689355442657650421d8e8398bd4abf9dbbaade65947bb0cb74a349cc497 nginx-upload-progress-module-0.9.2.tar.gz
-f9491dd24390b0d5d70dfe3553edf3d14efeb7c7a81b4d4a20c5cfeaefc1141c nginx-rtmp-module-1.1.10.tar.gz
-df873f301f947192c854994bb0e1bac46f73a5d3cf91df997f1b6a8ed26b5724 nginx.conf
-f53fd49af9b4bc308653abb85d9989879ce1fb48e43c508f5f45c84f74513865 default.conf
-b063611c6cb2d33bd43c4b17bf4135dda25f209bb77e4e66d1b156cffc37fbe6 nginx.logrotate
-3d8a90d2f75b7f24c4d74722b5b3ac11d85f416c2d7641b4280d7c126bfe8395 nginx.initd
-a24ef5843ae0afa538b00c37eb7da7870f9d7f146f52a9668678f7296cf71d9b ipv6.patch"
sha512sums="25cddbe5c419700aeca41bff3be5b7c3accfb38ad846ec8d91d81ab7c15f10db719f02d9263edf1fa12f59805ff7001b62864dc2885370b24afeea1d7d2afbbf nginx-1.10.3.tar.gz
+ca8be839aef71c537d6d3a79e2894f38790834d6310c6d15ad06900c7c2d7cf71a113847ab96ef9be0fbdfff3b7808e74dea427502b275cfd6c909550f9ba9ab nginx-tests-cdd44ff602db.tar.gz
558764c9be913a4f61d0e277d07bf3c272e1ce086b3fadb85b693a7e92805cd9fca4da7a8d29c96e53fc0d23b331327d3b2561ff61f19d2330e7d5d35ac7d614 ngx_devel_kit-0.3.0.tar.gz
c455bee73cebd0752449472452d15614b9587ddd199263d366484ede890c4d108eacbbeaef31adc9dc7732b56ef2bfc73c0fef3366366db03a8ec3fdc27a985c echo-nginx-module-0.60.tar.gz
ce0043ad4a2b638c5d99244d6caaa65ad142cea78884084a9aeca5a9593c68dbe508c9e4dd85dc5722eb63ef386612bffc48d4b6fc1487df244fbcb7a73bffe1 ngx-fancyindex-0.4.1.tar.gz