mirror of
https://github.com/openresty/openresty.git
synced 2024-10-13 00:29:41 +00:00
now we also test the generated makefiles in our test suite.
This commit is contained in:
12
t/Config.pm
12
t/Config.pm
@ -60,6 +60,18 @@ sub run_test ($) {
|
||||
is($stdout, $expected_out, "$name - stdout ok");
|
||||
is($stderr, $expected_err, "$name - stderr ok");
|
||||
is($retval >> 8, $expected_exit, "$name - exit code ok");
|
||||
|
||||
if (defined $block->makefile) {
|
||||
open my $in, "Makefile" or
|
||||
die "cannot open Makefile for reading: $!";
|
||||
my $got = do { local $/; <$in> };
|
||||
close $in;
|
||||
|
||||
my $expected_makefile = $block->makefile;
|
||||
$expected_makefile =~ s/\$OPENRESTY_BUILD_DIR\b/$BuildRoot/gs;
|
||||
|
||||
is($got, $expected_makefile, "$name - Makefile ok");
|
||||
}
|
||||
}
|
||||
|
||||
sub shell (@) {
|
||||
|
41
t/sanity.t
41
t/sanity.t
@ -2,7 +2,7 @@
|
||||
|
||||
use t::Config;
|
||||
|
||||
plan tests => 3 * blocks();
|
||||
plan tests => 3 * blocks() + 3;
|
||||
|
||||
#no_diff();
|
||||
|
||||
@ -199,6 +199,19 @@ cd nginx-0.8.54
|
||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||
--with-http_ssl_module
|
||||
cd ../..
|
||||
--- makefile
|
||||
.PHONY: all install
|
||||
|
||||
all:
|
||||
cd build/lua-5.1.4 && $(MAKE) linux
|
||||
cd build/nginx-0.8.54 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd build/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
|
||||
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
rm -rf build
|
||||
|
||||
|
||||
|
||||
@ -234,6 +247,19 @@ cd nginx-0.8.54
|
||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||
--with-http_ssl_module
|
||||
cd ../..
|
||||
--- makefile
|
||||
.PHONY: all install
|
||||
|
||||
all:
|
||||
cd build/lua-5.1.4 && $(MAKE) linux
|
||||
cd build/nginx-0.8.54 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd build/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
|
||||
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
rm -rf build
|
||||
|
||||
|
||||
|
||||
@ -278,4 +304,17 @@ cd nginx-0.8.54
|
||||
--with-ld-opt='-Wl,-rpath=/usr/local/openresty/luajit/lib' \
|
||||
--with-http_ssl_module
|
||||
cd ../..
|
||||
--- makefile
|
||||
.PHONY: all install
|
||||
|
||||
all:
|
||||
cd build/LuaJIT-2.0.0-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit
|
||||
cd build/nginx-0.8.54 && $(MAKE)
|
||||
|
||||
install:
|
||||
cd build/LuaJIT-2.0.0-beta6 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
|
||||
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||
|
||||
clean:
|
||||
rm -rf build
|
||||
|
||||
|
Reference in New Issue
Block a user