Skip to content

Commit c56b8bb

Browse files
committed
Add upstream deps
1 parent 08e8032 commit c56b8bb

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

test/build_helper.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
mkdir_cmd = local["mkdir"]["-p"]
1414

1515
def getLinkFilename(link):
16-
return link.split("/")[-1]
16+
return link.split("#")[0].split("/")[-1]
1717

1818
def getLinkDir(link):
19+
if "#" in link:
20+
return os.path.join(ngx_dir, link.split("#")[1])
1921
return os.path.join(ngx_dir, getLinkFilename(link).replace(".tar.gz", ""))
2022

2123
if local.cwd.split("/")[-1]!= "ngx_http_websocket_stat_module":
@@ -41,7 +43,7 @@ def download(links):
4143
if os.path.exists(path):
4244
continue
4345
print("Downloading {}".format(filename))
44-
wget_cmd(link, '--directory-prefix', download_dir)
46+
wget_cmd(link.split("#")[0], '--directory-prefix', download_dir)
4547

4648
def untar(links):
4749
for lib in links:
@@ -51,7 +53,7 @@ def untar(links):
5153

5254
def make(links):
5355
for lib in links:
54-
if lib == "nginx":
56+
if lib.startswith("nginx"):
5557
continue
5658
filename = getLinkFilename(links[lib])
5759
directory = getLinkDir(links[lib])
@@ -72,7 +74,7 @@ def make_nginx(links):
7274
"--with-zlib=" + os.path.join(this_dir, getLinkDir(links["zlib"])),
7375
"--with-http_stub_status_module",
7476
"--with-openssl=" + os.path.join(this_dir, getLinkDir(links["openssl"])),
75-
"--add-module=../../../nginx_upstream_check_module",
77+
"--add-module=../nginx_upstream_check_module-master",
7678
"--with-http_ssl_module",
7779
"--with-file-aio",
7880
"--with-http_addition_module",

test/test_config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
conf_file = "nginx.conf"
66

77
links = {
8+
"nginx_upstream_check_module": "https://codeload.github.com/Refinitiv/nginx_upstream_check_module/tar.gz/master#nginx_upstream_check_module-master",
89
"pcre" : "https://ftp.pcre.org/pub/pcre/pcre-8.41.tar.gz",
910
"zlib" : "https://zlib.net/zlib-1.2.11.tar.gz",
1011
"openssl": "https://www.openssl.org/source/openssl-1.0.2k.tar.gz",

0 commit comments

Comments
 (0)