Tests: Move ngx.re.opt into init_by_lua

Author: alubbe

t/re-find.t

@@ -13,27 +13,31 @@ plan tests => repeat_each() * (blocks() * 5);
 
 my $pwd = cwd();
 
-our $HttpConfig = <<_EOC_;
-    lua_package_path "$pwd/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
-    init_by_lua '
-        -- local verbose = true
-        local verbose = false
-        local outfile = "$Test::Nginx::Util::ErrLogFile"
-        -- local outfile = "/tmp/v.log"
-        if verbose then
-            local dump = require "jit.dump"
-            dump.on(nil, outfile)
-        else
-            local v = require "jit.v"
-            v.on(outfile)
-        end
-
-        require "resty.core"
-        -- jit.opt.start("hotloop=1")
-        -- jit.opt.start("loopunroll=1000000")
-        -- jit.off()
-    ';
-_EOC_
+sub HttpConfig {
+    return <<_EOC_;
+        lua_package_path "$pwd/lib/?.lua;../lua-resty-lrucache/lib/?.lua;;";
+        init_by_lua '
+            -- local verbose = true
+            local verbose = false
+            local outfile = "$Test::Nginx::Util::ErrLogFile"
+            -- local outfile = "/tmp/v.log"
+            if verbose then
+                local dump = require "jit.dump"
+                dump.on(nil, outfile)
+            else
+                local v = require "jit.v"
+                v.on(outfile)
+            end
+
+            require "resty.core"
+            -- jit.opt.start("hotloop=1")
+            -- jit.opt.start("loopunroll=1000000")
+            -- jit.off()
+
+            $_[0]
+        ';
+    _EOC_
+}
 
 #no_diff();
 no_long_string();
@@ -43,7 +47,7 @@ run_tests();
 __DATA__
 
 === TEST 1: matched, no submatch, no jit compile, no regex cache
---- http_config eval: $::HttpConfig
+--- http_config eval: $::HttpConfig()
 --- config
     location = /re {
         access_log off;
@@ -82,7 +86,7 @@ bad argument type
 
 
 === TEST 2: matched, no submatch, jit compile, regex cache
---- http_config eval: $::HttpConfig
+--- http_config eval: $::HttpConfig()
 --- config
     location = /re {
         access_log off;
@@ -121,7 +125,7 @@ NYI
 
 
 === TEST 3: not matched, no submatch, jit compile, regex cache
---- http_config eval: $::HttpConfig
+--- http_config eval: $::HttpConfig()
 --- config
     location = /re {
         access_log off;
@@ -158,7 +162,7 @@ NYI
 
 
 === TEST 4: nil submatch (2nd)
---- http_config eval: $::HttpConfig
+--- http_config eval: $::HttpConfig()
 --- config
     location /re {
         content_by_lua '
@@ -193,7 +197,7 @@ qr/\[TRACE   \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
 
 
 === TEST 5: nil submatch (1st)
---- http_config eval: $::HttpConfig
+--- http_config eval: $::HttpConfig()
 --- config
     location /re {
         content_by_lua '
@@ -228,7 +232,7 @@ qr/\[TRACE   \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
 
 
 === TEST 6: specify the group (2)
---- http_config eval: $::HttpConfig
+--- http_config eval: $::HttpConfig()
 --- config
     location /re {
         content_by_lua '
@@ -264,12 +268,11 @@ qr/\[TRACE   \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
 
 
 === TEST 7: matched, no submatch, no jit compile, no regex cache, large jit_stack_size
---- http_config eval: $::HttpConfig
+--- http_config eval: $::HttpConfig('ngx.re.opt("jit_stack_size", 128 * 1024)')
 --- config
     location = /re {
         access_log off;
         content_by_lua '
-            ngx.re.opt("jit_stack_size", 128 * 1024) 
             local from, to, err
             local find = ngx.re.find
             local s = "a"
@@ -304,12 +307,11 @@ bad argument type
 
 
 === TEST 8: matched, no submatch, jit compile, regex cache, large jit_stack_size
---- http_config eval: $::HttpConfig
+--- http_config eval: $::HttpConfig('ngx.re.opt("jit_stack_size", 128 * 1024)')
 --- config
     location = /re {
         access_log off;
         content_by_lua '
-            ngx.re.opt("jit_stack_size", 128 * 1024) 
             local from, to, err
             local find = ngx.re.find
             local s = "a"