Mercurial > hg > nginx-tests
diff range-flv.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 | 726c3c2a8b8c |
children | 8ac1faaddd2c |
line wrap: on
line diff
--- a/range-flv.t Tue Oct 13 05:16:45 2009 +0400 +++ b/range-flv.t Wed Oct 14 02:23:52 2009 +0400 @@ -25,6 +25,8 @@ $t->write_file_expand('nginx.conf', <<'EOF'); +%%TEST_GLOBALS%% + master_process off; daemon off; @@ -32,12 +34,7 @@ } http { - access_log off; - root %%TESTDIR%%; - - client_body_temp_path %%TESTDIR%%/client_body_temp; - fastcgi_temp_path %%TESTDIR%%/fastcgi_temp; - proxy_temp_path %%TESTDIR%%/proxy_temp; + %%TEST_GLOBALS_HTTP%% server { listen 127.0.0.1:8080;