Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
tarantool
Commits
758b4a22
Commit
758b4a22
authored
10 years ago
by
Dmitry E. Oboukhov
Browse files
Options
Downloads
Patches
Plain Diff
Enable box.digest in stable, closes #297
+ fix bsdsocket test
parent
7885e3f2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/lua/init.cc
+2
-0
2 additions, 0 deletions
src/lua/init.cc
test/box/bsdsocket.result
+4
-8
4 additions, 8 deletions
test/box/bsdsocket.result
test/box/bsdsocket.test
+2
-3
2 additions, 3 deletions
test/box/bsdsocket.test
test/box/lua.result
+1
-0
1 addition, 0 deletions
test/box/lua.result
with
9 additions
and
11 deletions
src/lua/init.cc
+
2
−
0
View file @
758b4a22
...
...
@@ -78,9 +78,11 @@ struct lua_State *tarantool_L;
/* contents of src/lua/ files */
extern
char
uuid_lua
[];
extern
char
session_lua
[];
extern
char
digest_lua
[];
static
const
char
*
lua_sources
[]
=
{
uuid_lua
,
session_lua
,
digest_lua
,
NULL
};
...
...
This diff is collapsed.
Click to expand it.
test/box/bsdsocket.result
+
4
−
8
View file @
758b4a22
...
...
@@ -18,9 +18,9 @@ lua type(s)
---
- table
...
lua s
lua s
tring.match(tostring(s), 'fd %d+, aka 0%.0%.0%.0:0') ~= nil
---
-
fd 10, aka 0.0.0.0:0
-
true
...
lua s:errno()
---
...
...
@@ -455,9 +455,9 @@ lua s:bind('unix/', '/tmp/tarantool-test-socket')
---
- true
...
lua
tostring(sc)
lua
string.match(tostring(sc), 'fd %d+, aka unix/:/tmp/tarantool%-test%-socket') ~= nil
---
-
fd 12, aka unix/:/tmp/tarantool-test-socket
-
true
...
lua s:listen(1234)
---
...
...
@@ -527,10 +527,6 @@ lua #(box.socket.getaddrinfo('mail12211alklkl.ru', 'http', {})) == 0
lua sc = box.socket('PF_INET', 'SOCK_STREAM', 'tcp')
---
...
lua tostring(sc)
---
- fd 12, aka 0.0.0.0:0
...
lua sc:getsockopt('SOL_SOCKET', 'SO_ERROR')
---
- 0
...
...
This diff is collapsed.
Click to expand it.
test/box/bsdsocket.test
+
2
−
3
View file @
758b4a22
...
...
@@ -10,7 +10,7 @@ exec admin "lua box.socket('PF_INET', 'SOCK_STREAM', 'tcp121222'); return box.er
exec
admin
"lua s = box.socket('PF_INET', 'SOCK_STREAM', 'tcp')"
exec
admin
"lua s:wait(.01)"
exec
admin
"lua type(s)"
exec
admin
"lua s"
exec
admin
"lua s
tring.match(tostring(s), 'fd %d+, aka 0%.0%.0%.0:0') ~= nil
"
exec
admin
"lua s:errno()"
exec
admin
"lua type(s:error())"
...
...
@@ -138,7 +138,7 @@ exec admin "lua s:nonblock()"
if
os
.
path
.
exists
(
'/tmp/tarantool-test-socket'
)
:
os
.
unlink
(
'/tmp/tarantool-test-socket'
)
exec
admin
"lua s:bind('unix/', '/tmp/tarantool-test-socket')"
exec
admin
"lua
tostring(sc)
"
exec
admin
"lua
string.match(tostring(sc), 'fd %d+, aka unix/:/tmp/tarantool%-test%-socket') ~= nil
"
exec
admin
"lua s:listen(1234)"
exec
admin
"lua sc = box.socket('PF_UNIX', 'SOCK_STREAM', 'ip')"
...
...
@@ -166,7 +166,6 @@ exec admin "lua #(box.socket.getaddrinfo('mail.ru', 'http', {})) > 0"
exec
admin
"lua #(box.socket.getaddrinfo('mail12211alklkl.ru', 'http', {})) == 0"
exec
admin
"lua sc = box.socket('PF_INET', 'SOCK_STREAM', 'tcp')"
exec
admin
"lua tostring(sc)"
exec
admin
"lua sc:getsockopt('SOL_SOCKET', 'SO_ERROR')"
exec
admin
"lua sc:nonblock(true)"
exec
admin
"lua sc:readable()"
...
...
This diff is collapsed.
Click to expand it.
test/box/lua.result
+
1
−
0
View file @
758b4a22
No preview for this file type
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment