comparison proxy-noclose.t @ 107:1c0ec30614c6

Tests: add TEST_GLOBALS and TEST_GLOBALS_HTTP config chunks. TEST_GLOBALS replaces previously used -g switch. This allows tests to be executed on 0.6.* branch. For compatibility with old tests -g switch will be used if TEST_GLOBALS wasn't expaneded in config. TEST_GLOBALS_HTTP replaces multiple variables (access_log, root, client_body_temp_path, proxy_temp_path, fastcgi_temp_path) previously specified directly in test configs. This change reduce duplication and allows tests to be used with nginx compiled without fastcgi and/or proxy modules (as proxy_temp_path and fastcgi_temp_path are added conditionally).
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 14 Oct 2009 02:23:52 +0400
parents 6e5884419e4a
children 5d31f920eda9
comparison
equal deleted inserted replaced
106:7a712d3909ba 107:1c0ec30614c6
34 34
35 my $t = Test::Nginx->new(); 35 my $t = Test::Nginx->new();
36 36
37 $t->write_file_expand('nginx.conf', <<'EOF'); 37 $t->write_file_expand('nginx.conf', <<'EOF');
38 38
39 %%TEST_GLOBALS%%
40
39 master_process off; 41 master_process off;
40 daemon off; 42 daemon off;
41 43
42 events { 44 events {
43 } 45 }
44 46
45 http { 47 http {
46 access_log off; 48 %%TEST_GLOBALS_HTTP%%
47 root %%TESTDIR%%;
48
49 client_body_temp_path %%TESTDIR%%/client_body_temp;
50 fastcgi_temp_path %%TESTDIR%%/fastcgi_temp;
51 proxy_temp_path %%TESTDIR%%/proxy_temp;
52 49
53 server { 50 server {
54 listen 127.0.0.1:8080; 51 listen 127.0.0.1:8080;
55 server_name localhost; 52 server_name localhost;
56 53