Mercurial > hg > nginx-tests

comparison expect-100-continue.t @ 107:1c0ec30614c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 726c3c2a8b8c
children 8ac1faaddd2c
comparison
equal deleted inserted replaced
106:7a712d3909ba 107:1c0ec30614c6
23 23
24 my $t = Test::Nginx->new()->plan(2); 24 my $t = Test::Nginx->new()->plan(2);
25 25
26 $t->write_file_expand('nginx.conf', <<'EOF'); 26 $t->write_file_expand('nginx.conf', <<'EOF');
27 27
28 %%TEST_GLOBALS%%
29
28 master_process off; 30 master_process off;
29 daemon off; 31 daemon off;
30 32
31 events { 33 events {
32 } 34 }
33 35
34 http { 36 http {
35 access_log off; 37 %%TEST_GLOBALS_HTTP%%
36 root %%TESTDIR%%;
37
38 client_body_temp_path %%TESTDIR%%/client_body_temp;
39 fastcgi_temp_path %%TESTDIR%%/fastcgi_temp;
40 proxy_temp_path %%TESTDIR%%/proxy_temp;
41 38
42 server { 39 server {
43 listen 127.0.0.1:8080; 40 listen 127.0.0.1:8080;
44 server_name localhost; 41 server_name localhost;
45 location / { 42 location / {