[compiler-rt] 300dc05 - [lsan] Remove undefined ENV variables

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2021-07-20T17:47:01-07:00
New Revision: 300dc054e695ee18beb6f4a23898e50938251e2b

URL: https://github.com/llvm/llvm-project/commit/300dc054e695ee18beb6f4a23898e50938251e2b
DIFF: https://github.com/llvm/llvm-project/commit/300dc054e695ee18beb6f4a23898e50938251e2b.diff

LOG: [lsan] Remove undefined ENV variables

Added: 
    

Modified: 
    compiler-rt/test/lsan/TestCases/ignore_object_errors.cpp
    compiler-rt/test/lsan/TestCases/use_after_return.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/lsan/TestCases/ignore_object_errors.cpp b/compiler-rt/test/lsan/TestCases/ignore_object_errors.cpp
index 76cd3bbf34f6..00f18bb49b95 100644
--- a/compiler-rt/test/lsan/TestCases/ignore_object_errors.cpp
+++ b/compiler-rt/test/lsan/TestCases/ignore_object_errors.cpp
@@ -1,6 +1,6 @@
 // Test for incorrect use of __lsan_ignore_object().
 // RUN: %clangxx_lsan %s -o %t
-// RUN: %env_lsan_opts=$LSAN_BASE %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s
 
 #include <stdio.h>
 #include <stdlib.h>

diff  --git a/compiler-rt/test/lsan/TestCases/use_after_return.cpp b/compiler-rt/test/lsan/TestCases/use_after_return.cpp
index decab6c69611..08252eb133e0 100644
--- a/compiler-rt/test/lsan/TestCases/use_after_return.cpp
+++ b/compiler-rt/test/lsan/TestCases/use_after_return.cpp
@@ -2,9 +2,9 @@
 // in the root set.
 // RUN: LSAN_BASE="report_objects=1:use_registers=0"
 // RUN: %clangxx_lsan %s -O2 -o %t
-// RUN: ASAN_OPTIONS=$ASAN_OPTIONS:detect_stack_use_after_return=1 %env_lsan_opts=$LSAN_BASE:"use_stacks=0" not %run %t 2>&1 | FileCheck %s
-// RUN: ASAN_OPTIONS=$ASAN_OPTIONS:detect_stack_use_after_return=1 %env_lsan_opts=$LSAN_BASE:"use_stacks=1" %run %t 2>&1
-// RUN: ASAN_OPTIONS=$ASAN_OPTIONS:detect_stack_use_after_return=1 %env_lsan_opts="" %run %t 2>&1
+// RUN: ASAN_OPTIONS=detect_stack_use_after_return=1 %env_lsan_opts=$LSAN_BASE:"use_stacks=0" not %run %t 2>&1 | FileCheck %s
+// RUN: ASAN_OPTIONS=detect_stack_use_after_return=1 %env_lsan_opts=$LSAN_BASE:"use_stacks=1" %run %t 2>&1
+// RUN: ASAN_OPTIONS=detect_stack_use_after_return=1 %env_lsan_opts="" %run %t 2>&1
 
 // Investigate why it does not fail with use_stack=0
 // UNSUPPORTED: arm-linux || armhf-linux