186526
/
openresty
mirror of https://github.com/openresty/openresty.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

util/dist-check: made the script self-contained by inlining the test nginx.conf. also fixed compatibility on recent versions of Mac OS X (like 10.10).

This commit is contained in:
Yichun Zhang (agentzh) 2015-02-28 21:14:50 -08:00
parent 387089ca11
commit c01de73e41
1 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
util/dist-check
View File

@ -7,6 +7,7 @@ use Getopt::Std qw(getopts);
use Cwd qw/cwd/;
sub sh ($);
sub write_config_file ($);
my %opts;
getopts("lf:", \%opts) or die "Usage: $0 [-f] [-l] <cores>\n";
@ -44,8 +45,26 @@ if ($^O eq 'solaris') {
$cfg_opts .= " --with-cc=gcc";
}
if ($^O eq 'darwin') {
$cfg_opts .= " --with-cc-opt='-I/usr/local/include'"
. " --with-ld-opt='-L/usr/local/lib'";
}
my $prefix;
my $config = do { local $/; <DATA> };
sub write_config_file ($) {
my $outfile = shift;
warn "Writing file $outfile\n";
open my $out, ">$outfile" or
die "Cannot open $outfile for writing: $!\n";
print $out $config;
close $out;
}
write_config_file "/tmp/nginx.conf";
warn "=== Without Gzip ===\n";
$prefix = "/usr/local/openresty-nogzip";
unless ($opts{f}) {
@ -53,6 +72,7 @@ unless ($opts{f}) {
}
sh "$make -j$jobs > /dev/null";
sh "sudo $make install > /dev/null";
sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf";
sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver";
sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--without-http_gzip_module'";
system "sudo killall nginx > /dev/null 2>&1";
@ -70,6 +90,7 @@ unless ($opts{f}) {
}
sh "$make -j$jobs > /dev/null";
sh "sudo $make install > /dev/null";
sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf";
sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver";
#sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-no-pool-patch'";
system "sudo killall nginx > /dev/null 2>&1";
@ -88,6 +109,7 @@ unless ($opts{f}) {
}
sh "$make -j$jobs > /dev/null";
sh "sudo $make install > /dev/null";
sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf";
sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver";
system "sudo killall nginx > /dev/null 2>&1";
sh "sudo $prefix/nginx/sbin/nginx";
@ -108,6 +130,7 @@ unless ($opts{f}) {
}
sh "$make -j$jobs > /dev/null";
sh "sudo $make install > /dev/null";
sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf";
sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver";
sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-debug'";
system "sudo killall nginx > /dev/null 2>&1";
@ -125,6 +148,7 @@ unless ($opts{f}) {
}
sh "$make -j$jobs > /dev/null";
sh "sudo $make install > /dev/null";
sh "sudo cp /tmp/nginx.conf $prefix/nginx/conf/nginx.conf";
sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep $ver";
sh "$prefix/nginx/sbin/nginx -V 2>&1 |grep '\\--with-dtrace-probes'";
system "sudo killall nginx > /dev/null 2>&1";
@ -146,3 +170,49 @@ sub sh ($) {
my $cmd = shift;
system($cmd) == 0 or die "Command \"$cmd\" failed";
}
__DATA__
user nobody;
worker_processes 1;
error_log logs/error.log;
pid logs/nginx.pid;
events {
accept_mutex off;
worker_connections 256;
}
http {
include mime.types;
default_type application/octet-stream;
init_by_lua '
if jit then
require "resty.core"
end
';
server {
listen *:80;
server_name localhost;
location = /lua {
content_by_lua '
local upstream = require "ngx.upstream"
if jit then
ngx.say(jit.version)
else
ngx.say(_VERSION)
end
';
}
location = /cjson {
content_by_lua '
local json = require "cjson.safe"
ngx.say("cjson.safe: ", json.encode{foo = 123})
';
}
}
}