Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
6622f651
Unverified
Commit
6622f651
authored
Apr 19, 2021
by
Christian Brauner
Committed by
GitHub
Apr 19, 2021
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3800 from evverx/gh3796
Revert "ci: get around
https://github.com/lxc/lxc/issues/3796
"
parents
77d2bd1a
94019577
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
10 deletions
+1
-10
sanitizers.sh
.github/workflows/sanitizers.sh
+0
-10
console_log.c
src/tests/console_log.c
+1
-0
No files found.
.github/workflows/sanitizers.sh
View file @
6622f651
...
@@ -48,16 +48,6 @@ ASAN_OPTIONS=$ASAN_OPTIONS:detect_leaks=0 UBSAN_OPTIONS=$UBSAN_OPTIONS /usr/bin/
...
@@ -48,16 +48,6 @@ ASAN_OPTIONS=$ASAN_OPTIONS:detect_leaks=0 UBSAN_OPTIONS=$UBSAN_OPTIONS /usr/bin/
EOF
EOF
chmod
+x /usr/bin/lxc-test-concurrent
chmod
+x /usr/bin/lxc-test-concurrent
if
[[
"
$CC
"
==
"clang"
]]
;
then
mv
/usr/bin/
{
lxc-test-console-log,test-console-log.orig
}
cat
<<
EOF
>/usr/bin/lxc-test-console-log
#!/bin/bash
printf "Memory leaks are ignored due to https://github.com/lxc/lxc/issues/3796.\n"
ASAN_OPTIONS=
$ASAN_OPTIONS
:detect_leaks=0 UBSAN_OPTIONS=
$UBSAN_OPTIONS
/usr/bin/test-console-log.orig
EOF
chmod
+x /usr/bin/lxc-test-console-log
fi
sed
-i
's/USE_LXC_BRIDGE="false"/USE_LXC_BRIDGE="true"/'
/etc/default/lxc
sed
-i
's/USE_LXC_BRIDGE="false"/USE_LXC_BRIDGE="true"/'
/etc/default/lxc
systemctl daemon-reload
systemctl daemon-reload
systemctl restart apparmor
systemctl restart apparmor
...
...
src/tests/console_log.c
View file @
6622f651
...
@@ -109,6 +109,7 @@ int main(int argc, char *argv[])
...
@@ -109,6 +109,7 @@ int main(int argc, char *argv[])
lxc_debug
(
"Retrieved %"
PRIu64
lxc_debug
(
"Retrieved %"
PRIu64
" bytes from console log. Contents are
\"
%s
\"\n
"
,
" bytes from console log. Contents are
\"
%s
\"\n
"
,
*
log
.
read_max
,
log
.
data
);
*
log
.
read_max
,
log
.
data
);
free
(
log
.
data
);
}
}
/* Leave another two seconds to ensure boot is finished. */
/* Leave another two seconds to ensure boot is finished. */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment