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
c44ed3c0
Commit
c44ed3c0
authored
4 years ago
by
Kirill Yukhin
Browse files
Options
Downloads
Patches
Plain Diff
test: fix LTO build for popen unit test
Fixa clash in struct names detected by LTO.
parent
a46611a3
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
test/unit/mp_error.cc
+9
-9
9 additions, 9 deletions
test/unit/mp_error.cc
with
9 additions
and
9 deletions
test/unit/mp_error.cc
+
9
−
9
View file @
c44ed3c0
...
...
@@ -52,7 +52,7 @@ enum {
MP_ERROR_FIELDS
=
0x06
};
struct
mp_error
{
struct
mp_
test_
error
{
uint32_t
code
;
uint32_t
line
;
int32_t
saved_errno
;
...
...
@@ -96,7 +96,7 @@ mp_encode_str0(char *data, const char *str)
/** Note, not the same as mp_encode_error(). */
static
char
*
mp_encode_mp_error
(
const
struct
mp_error
*
e
,
char
*
data
)
mp_encode_mp_error
(
const
struct
mp_
test_
error
*
e
,
char
*
data
)
{
uint32_t
fields_num
=
6
;
int
field_count
=
(
e
->
custom_type
!=
NULL
)
+
...
...
@@ -167,7 +167,7 @@ mp_encode_test_error_stack(char *data)
/*
* CustomError
*/
struct
mp_error
err
;
struct
mp_
test_
error
err
;
memset
(
&
err
,
0
,
sizeof
(
err
));
err
.
code
=
123
;
err
.
line
=
1
;
...
...
@@ -221,7 +221,7 @@ mp_encode_test_error_stack(char *data)
}
static
bool
error_is_eq_mp_error
(
struct
error
*
err
,
struct
mp_error
*
check
)
error_is_eq_mp_error
(
struct
error
*
err
,
struct
mp_
test_
error
*
check
)
{
if
(
err
->
saved_errno
!=
check
->
saved_errno
)
return
false
;
...
...
@@ -270,7 +270,7 @@ test_stack_error_decode()
struct
error
*
err2
=
err1
->
cause
;
struct
error
*
err3
=
err2
->
cause
;
struct
mp_error
check
;
struct
mp_
test_
error
check
;
memset
(
&
check
,
0
,
sizeof
(
check
));
check
.
code
=
123
;
check
.
line
=
1
;
...
...
@@ -332,7 +332,7 @@ test_decode_unknown_type()
memset
(
buffer
,
0
,
sizeof
(
buffer
));
char
*
data
=
mp_encode_error_header
(
buffer
,
1
);
struct
mp_error
err
;
struct
mp_
test_
error
err
;
memset
(
&
err
,
0
,
sizeof
(
err
));
err
.
code
=
1
;
err
.
line
=
2
;
...
...
@@ -364,7 +364,7 @@ test_fail_not_enough_fields()
memset
(
buffer
,
0
,
sizeof
(
buffer
));
char
*
data
=
mp_encode_error_header
(
buffer
,
1
);
struct
mp_error
err
;
struct
mp_
test_
error
err
;
memset
(
&
err
,
0
,
sizeof
(
err
));
err
.
code
=
42
;
err
.
line
=
3
;
...
...
@@ -395,7 +395,7 @@ test_unknown_fields()
memset
(
buffer
,
0
,
sizeof
(
buffer
));
char
*
data
=
mp_encode_error_header
(
buffer
,
1
);
struct
mp_error
err
;
struct
mp_
test_
error
err
;
memset
(
&
err
,
0
,
sizeof
(
err
));
err
.
code
=
0
;
err
.
line
=
1
;
...
...
@@ -426,7 +426,7 @@ test_unknown_additional_fields()
memset
(
buffer
,
0
,
sizeof
(
buffer
));
char
*
data
=
mp_encode_error_header
(
buffer
,
1
);
struct
mp_error
err
;
struct
mp_
test_
error
err
;
memset
(
&
err
,
0
,
sizeof
(
err
));
err
.
code
=
42
;
err
.
line
=
3
;
...
...
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