Merge branch 'stable'

Conflicts:
	test/box/configuration.test

test/box/configuration.result

@@ -38,3 +38,15 @@ print_config()
   too_long_threshold: 0.5
   wal_dir_rescan_delay: 0.1
 ...
+string.gmatch(package.path, '([^;]*)')()
+---
+- script_dir/?.lua
+...
+string.gmatch(package.cpath, '([^;]*)')()
+---
+- script_dir/?.so
+...
+mod.test(10, 15)
+---
+- 25
+...

test/box/configuration.test.py

@@ -24,6 +24,15 @@ server.stop()
 server.deploy("box/tarantool_scriptdir.cfg")
 admin("print_config()")
 
+# Test script_dir + require
+server.stop()
+shutil.copy("box/require_init.lua", os.path.join(script_dir_path, "init.lua"))
+shutil.copy("box/require_mod.lua", os.path.join(script_dir_path, "mod.lua"))
+server.deploy("box/tarantool_scriptdir.cfg")
+admin("string.gmatch(package.path, '([^;]*)')()")
+admin("string.gmatch(package.cpath, '([^;]*)')()")
+admin("mod.test(10, 15)")
+
 # restore default server
 server.stop()
 shutil.rmtree(script_dir_path, True)

test/box/require_init.lua

+mod = require("mod")

test/box/require_mod.lua

+exports = {}
+
+function exports.test(a, b)
+  return a+b
+end
+
+return exports