Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
steam-runtime-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package 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
steamrt
steam-runtime-tools
Commits
3063c695
Commit
3063c695
authored
5 years ago
by
Simon McVittie
Browse files
Options
Downloads
Patches
Plain Diff
Make tests cope with older GLib
Signed-off-by:
Simon McVittie
<
smcv@collabora.com
>
parent
c8216c90
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
glnx-backports.h
+12
-0
12 additions, 0 deletions
glnx-backports.h
tests/test-libglnx-xattrs.c
+4
-0
4 additions, 0 deletions
tests/test-libglnx-xattrs.c
with
16 additions
and
0 deletions
glnx-backports.h
+
12
−
0
View file @
3063c695
...
@@ -63,4 +63,16 @@ gboolean glnx_set_object (GObject **object_ptr,
...
@@ -63,4 +63,16 @@ gboolean glnx_set_object (GObject **object_ptr,
#endif
/* !GLIB_CHECK_VERSION(2, 44, 0) */
#endif
/* !GLIB_CHECK_VERSION(2, 44, 0) */
#ifndef g_assert_nonnull
#define g_assert_nonnull(x) g_assert (x != NULL)
#endif
#ifndef g_assert_null
#define g_assert_null(x) g_assert (x == NULL)
#endif
#if !GLIB_CHECK_VERSION (2, 38, 0)
#define g_test_skip(s) g_test_message ("SKIP: %s", s)
#endif
G_END_DECLS
G_END_DECLS
This diff is collapsed.
Click to expand it.
tests/test-libglnx-xattrs.c
+
4
−
0
View file @
3063c695
...
@@ -218,7 +218,11 @@ test_xattr_races (void)
...
@@ -218,7 +218,11 @@ test_xattr_races (void)
/* FIXME - this deadlocks for me on 4.9.4-201.fc25.x86_64, whether
/* FIXME - this deadlocks for me on 4.9.4-201.fc25.x86_64, whether
* using overlayfs or xfs as source/dest.
* using overlayfs or xfs as source/dest.
*/
*/
#if GLIB_CHECK_VERSION (2, 36, 0)
const
guint
nprocs
=
MAX
(
4
,
g_get_num_processors
());
const
guint
nprocs
=
MAX
(
4
,
g_get_num_processors
());
#else
const
guint
nprocs
=
4
;
#endif
struct
XattrWorker
wdata
[
nprocs
];
struct
XattrWorker
wdata
[
nprocs
];
GThread
*
threads
[
nprocs
];
GThread
*
threads
[
nprocs
];
g_autoptr
(
GError
)
local_error
=
NULL
;
g_autoptr
(
GError
)
local_error
=
NULL
;
...
...
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