From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Tue, 13 Apr 2021 06:03:20 +0000 (+0000)
Subject: Revert "ci: get around https://github.com/lxc/lxc/issues/3796"
X-Git-Tag: lxc-5.0.0~199^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03478622cbbf62babc13ad4950c884188b28c208;p=thirdparty%2Flxc.git

Revert "ci: get around https://github.com/lxc/lxc/issues/3796"

This reverts commit 44818e893e68e6e76652323ff4f12c9214d2ffa7.

Signed-off-by: Evgeny Vereshchagin <evvers@ya.ru>
---

diff --git a/.github/workflows/sanitizers.sh b/.github/workflows/sanitizers.sh
index 6d4edf372..9a79eaa28 100755
--- a/.github/workflows/sanitizers.sh
+++ b/.github/workflows/sanitizers.sh
@@ -48,16 +48,6 @@ ASAN_OPTIONS=$ASAN_OPTIONS:detect_leaks=0 UBSAN_OPTIONS=$UBSAN_OPTIONS /usr/bin/
 EOF
 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
 systemctl daemon-reload
 systemctl restart apparmor