From 6be41fb47a1efb74ff08cf8d013a8f9be001aea9 Mon Sep 17 00:00:00 2001
From: Nils Wentzell <nils.wentzell@gmail.com>
Date: Tue, 24 Apr 2018 23:59:32 +0200
Subject: [PATCH] [cmake] Prepend UBSan options to Env

---
 test/c++/CMakeLists.txt    | 2 +-
 test/python/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/c++/CMakeLists.txt b/test/c++/CMakeLists.txt
index b445b900..012d07d1 100644
--- a/test/c++/CMakeLists.txt
+++ b/test/c++/CMakeLists.txt
@@ -30,5 +30,5 @@ endforeach()
 # Set UBSan Options for all tests
 set_property(TEST ${all_tests} PROPERTY
   ENVIRONMENT
-    UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1
+    UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1:$ENV{UBSAN_OPTIONS}
 )
diff --git a/test/python/CMakeLists.txt b/test/python/CMakeLists.txt
index c1241802..624768f4 100644
--- a/test/python/CMakeLists.txt
+++ b/test/python/CMakeLists.txt
@@ -18,5 +18,5 @@ set_property(TEST ${all_tests} PROPERTY
   ENVIRONMENT
     PYTHONPATH=${CMAKE_BINARY_DIR}/python:$ENV{PYTHONPATH}
     LD_PRELOAD=$<$<BOOL:${ASAN}>:${ASAN_RT_LIBRARY}>:$<$<BOOL:${UBSAN}>:${UBSAN_RT_LIBRARY}>
-    UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1
+    UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1:$ENV{UBSAN_OPTIONS}
 )