From 5f850cf9d8622a7bdc4877928580b1ecab31fa93 Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Mon, 12 Apr 2021 01:41:27 +0000
Subject: [PATCH] tests: pass on ASAN/UBSAN options to several tests

to make it easier to run them under ASan/UBSan.

Signed-off-by: Evgeny Vereshchagin <evvers@ya.ru>
---
 src/tests/lxc-test-apparmor-mount | 3 ++-
 src/tests/lxc-test-unpriv         | 3 ++-
 src/tests/lxc-test-usernic.in     | 3 ++-
 src/tests/lxc-test-usernsexec     | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount
index d21c94822..5b720d096 100755
--- a/src/tests/lxc-test-apparmor-mount
+++ b/src/tests/lxc-test-apparmor-mount
@@ -48,7 +48,8 @@ FAIL() {
 run_cmd() {
 	sudo -i -u $TUSER \
 	    env http_proxy=${http_proxy:-} https_proxy=${https_proxy:-} \
-	        XDG_RUNTIME_DIR=/run/user/$(id -u $TUSER) $*
+	        XDG_RUNTIME_DIR=/run/user/$(id -u $TUSER) ASAN_OPTIONS=${ASAN_OPTIONS:-} \
+		UBSAN_OPTIONS=${UBSAN_OPTIONS:-} $*
 }
 
 DONE=0
diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
index 3615b8341..eff54ed14 100755
--- a/src/tests/lxc-test-unpriv
+++ b/src/tests/lxc-test-unpriv
@@ -94,7 +94,8 @@ cleanup() {
 run_cmd() {
 	sudo -i -u $TUSER \
 	    env http_proxy=${http_proxy:-} https_proxy=${https_proxy:-} \
-	        XDG_RUNTIME_DIR=/run/user/$(id -u $TUSER) $*
+	        XDG_RUNTIME_DIR=/run/user/$(id -u $TUSER) ASAN_OPTIONS=${ASAN_OPTIONS:-} \
+		UBSAN_OPTIONS=${UBSAN_OPTIONS:-} $*
 }
 
 # create a test user
diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in
index 3e35008c6..3fb4e9e5e 100755
--- a/src/tests/lxc-test-usernic.in
+++ b/src/tests/lxc-test-usernic.in
@@ -60,7 +60,8 @@ cleanup() {
 run_cmd() {
 	sudo -i -u usernic-user \
 	    env http_proxy=${http_proxy:-} https_proxy=${https_proxy:-} \
-	        XDG_RUNTIME_DIR=/run/user/$(id -u usernic-user) $*
+	        XDG_RUNTIME_DIR=/run/user/$(id -u usernic-user) ASAN_OPTIONS=${ASAN_OPTIONS:-} \
+		UBSAN_OPTIONS=${UBSAN_OPTIONS:-} $*
 }
 
 ARCH=i386
diff --git a/src/tests/lxc-test-usernsexec b/src/tests/lxc-test-usernsexec
index 0ee48b353..d1fc81a58 100755
--- a/src/tests/lxc-test-usernsexec
+++ b/src/tests/lxc-test-usernsexec
@@ -292,7 +292,7 @@ setup_and_run() {
     fi
 
     debug 0 "as $asuser executing ${MYPATH} ${pt_args[*]}"
-    sudo -Hu "$asuser" "${MYPATH}" "${pt_args[@]}"
+    sudo -Hu "$asuser" ASAN_OPTIONS=${ASAN_OPTIONS:-} UBSAN_OPTIONS=${UBSAN_OPTIONS:-} "${MYPATH}" "${pt_args[@]}"
 }
 
 USERNSEXEC=${USERNSEXEC:-lxc-usernsexec}
-- 
2.47.2