comparison proxy-chunked.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 9ab3762332b9
children 8ac1faaddd2c
comparison
equal deleted inserted replaced
106:7a712d3909ba 107:1c0ec30614c6
29 29
30 my $t = Test::Nginx->new(); 30 my $t = Test::Nginx->new();
31 31
32 $t->write_file_expand('nginx.conf', <<'EOF'); 32 $t->write_file_expand('nginx.conf', <<'EOF');
33 33
34 %%TEST_GLOBALS%%
35
34 master_process off; 36 master_process off;
35 daemon off; 37 daemon off;
36 38
37 events { 39 events {
38 } 40 }
39 41
40 http { 42 http {
41 access_log off; 43 %%TEST_GLOBALS_HTTP%%
42 root %%TESTDIR%%;
43
44 client_body_temp_path %%TESTDIR%%/client_body_temp;
45 fastcgi_temp_path %%TESTDIR%%/fastcgi_temp;
46 proxy_temp_path %%TESTDIR%%/proxy_temp;
47 44
48 server { 45 server {
49 listen 127.0.0.1:8080; 46 listen 127.0.0.1:8080;
50 server_name localhost; 47 server_name localhost;
51 48