tests: updated the test suite so that it can be run in parallel mode.

Author: thibaultcha

.gitignore

@@ -48,7 +48,7 @@ src/args.[ch]
 echo
 reindex
 go
-t/servroot/
+t/servroot*
 *.plist
 Makefile
 t/*.t_

t/004-require.t

@@ -87,7 +87,7 @@ hello, foo
     content_by_lua_block {
         ngx.print(package.cpath);
     }
---- stream_response_like: ^[^;]+/servroot/html/\?.so$
+--- stream_response_like: ^[^;]+/servroot(_\d+)?/html/\?\.so$
 --- no_error_log
 [error]
 
@@ -100,7 +100,7 @@ hello, foo
     content_by_lua_block {
         ngx.print(package.path)
     }
---- stream_response_like: ^[^;]+/servroot/html/\?.lua;.+\.lua;$
+--- stream_response_like: ^[^;]+/servroot(_\d+)?/html/\?\.lua;(.+\.lua)?;*$
 --- no_error_log
 [error]
 
@@ -113,7 +113,7 @@ hello, foo
     content_by_lua_block {
         ngx.print(package.cpath)
     }
---- stream_response_like: ^[^;]+/servroot/html/\?.so;.+\.so;$
+--- stream_response_like: ^[^;]+/servroot(_\d+)?/html/\?\.so;(.+\.so)?;*$
 --- no_error_log
 [error]
 
@@ -126,7 +126,7 @@ hello, foo
     content_by_lua_block {
         ngx.print(package.path);
     }
---- stream_response_like: ^.+\.lua;[^;]+/servroot/html/\?.lua$
+--- stream_response_like: ^(.+\.lua)?;*?[^;]+/servroot(_\d+)?/html/\?\.lua$
 --- no_error_log
 [error]
 
@@ -139,7 +139,7 @@ hello, foo
     content_by_lua_block {
         ngx.print(package.cpath);
     }
---- stream_response_like: ^.+\.so;[^;]+/servroot/html/\?.so$
+--- stream_response_like: ^(.+\.so)?;*?[^;]+/servroot(_\d+)?/html/\?\.so$
 --- no_error_log
 [error]
 

t/025-codecache.t

@@ -26,7 +26,7 @@ __DATA__
 --- stream_server_config2
     content_by_lua_block {
         -- os.execute("(echo HERE; pwd) > /dev/stderr")
-        local f = assert(io.open("t/servroot/html/test.lua", "w"))
+        local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
         f:write("ngx.say(101)")
         f:close()
         ngx.say("updated")
@@ -58,7 +58,7 @@ updated
 --- stream_server_config2
     content_by_lua_block {
         -- os.execute("(echo HERE; pwd) > /dev/stderr")
-        local f = assert(io.open("t/servroot/html/test.lua", "w"))
+        local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
         f:write("ngx.say(101)")
         f:close()
         ngx.say("updated")
@@ -88,7 +88,7 @@ updated
 --- stream_server_config2
     content_by_lua_block {
         -- os.execute("(echo HERE; pwd) > /dev/stderr")
-        local f = assert(io.open("t/servroot/html/test.lua", "w"))
+        local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
         f:write("ngx.say(101)")
         f:close()
         ngx.say("updated")
@@ -122,7 +122,7 @@ qr/\[alert\] \S+ stream lua_code_cache is off; this will hurt performance/
 --- stream_server_config2
     content_by_lua_block {
         -- os.execute("(echo HERE; pwd) > /dev/stderr")
-        local f = assert(io.open("t/servroot/html/test.lua", "w"))
+        local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
         f:write("ngx.say(101)")
         f:close()
         ngx.say("updated")
@@ -155,7 +155,7 @@ qr/\[alert\] \S+ stream lua_code_cache is off; this will hurt performance/
 --- stream_server_config2
     content_by_lua_block {
         -- os.execute("(echo HERE; pwd) > /dev/stderr")
-        local f = assert(io.open("t/servroot/html/test.lua", "w"))
+        local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/test.lua", "w"))
         f:write("ngx.say(101)")
         f:close()
         ngx.say("updated")
@@ -190,7 +190,7 @@ qr/\[alert\] \S+ stream lua_code_cache is off; this will hurt performance/
 --- stream_server_config2
     content_by_lua_block {
         -- os.execute("(echo HERE; pwd) > /dev/stderr")
-        local f = assert(io.open("t/servroot/html/foo.lua", "w"))
+        local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
         f:write("module(..., package.seeall); ngx.say(102);")
         f:close()
         ngx.say("updated")
@@ -225,7 +225,7 @@ qr/\[alert\] \S+ stream lua_code_cache is off; this will hurt performance/
 --- stream_server_config2
     content_by_lua_block {
         -- os.execute("(echo HERE; pwd) > /dev/stderr")
-        local f = assert(io.open("t/servroot/html/foo.lua", "w"))
+        local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/foo.lua", "w"))
         f:write("module(..., package.seeall); ngx.say(102);")
         f:close()
         ngx.say("updated")

t/081-bytecode.t

@@ -21,7 +21,7 @@ __DATA__
     content_by_lua_block {
         local f = assert(loadstring("local a = a and a + 1 or 1 ngx.say('a = ', a)", "=code"))
         local bc = string.dump(f)
-        local f = assert(io.open("t/servroot/html/a.luac", "w"))
+        local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/a.luac", "w"))
         f:write(bc)
         f:close()
     }
@@ -39,7 +39,7 @@ a = 1
     content_by_lua_block {
         local f = assert(loadstring("local a = a and a + 1 or 1 ngx.say('a = ', a)", "=code"))
         local bc = string.dump(f, true)
-        local f = assert(io.open("t/servroot/html/a.luac", "w"))
+        local f = assert(io.open("$TEST_NGINX_SERVER_ROOT/html/a.luac", "w"))
         f:write(bc)
         f:close()
     }

t/109-timer-hup.t

@@ -44,7 +44,7 @@ __DATA__
 === TEST 1: single timer
 --- stream_server_config
     content_by_lua_block {
-        local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+        local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
         if not f then
             ngx.say("failed to open nginx.pid: ", err)
             return
@@ -94,7 +94,7 @@ timer prematurely expired: true
 === TEST 2: multiple timers
 --- stream_server_config
     content_by_lua_block {
-        local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+        local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
         if not f then
             ngx.say("failed to open nginx.pid: ", err)
             return
@@ -155,7 +155,7 @@ timer prematurely expired: true
 === TEST 3: trying to add new timer after HUP reload
 --- stream_server_config
     content_by_lua_block {
-        local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+        local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
         if not f then
             ngx.say("failed to open nginx.pid: ", err)
             return
@@ -208,7 +208,7 @@ failed to register a new timer after reload: process exiting, context: ngx.timer
 === TEST 4: trying to add new timer after HUP reload
 --- stream_server_config
     content_by_lua_block {
-        local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+        local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
         if not f then
             ngx.say("failed to open nginx.pid: ", err)
             return
@@ -270,7 +270,7 @@ g: exiting=true
 === TEST 5: HUP reload should abort pending timers
 --- stream_server_config
     content_by_lua_block {
-        local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+        local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
         if not f then
             ngx.say("failed to open nginx.pid: ", err)
             return
@@ -383,7 +383,7 @@ TODO
             end
             local ok, err = ngx.timer.at(1, background_thread)
 
-            local f, err = io.open("t/servroot/logs/nginx.pid", "r")
+            local f, err = io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r")
             if not f then
                 ngx.say("failed to open nginx.pid: ", err)
                 return
@@ -434,7 +434,7 @@ lua found 1 pending timers
             end
 
             if kill then
-                local f, err = assert(io.open("t/servroot/logs/nginx.pid", "r"))
+                local f, err = assert(io.open("$TEST_NGINX_SERVER_ROOT/logs/nginx.pid", "r"))
                 local pid = f:read()
                 -- ngx.say("master pid: [", pid, "]")
                 f:close()