[llvm-branch-commits] [compiler-rt-branch] r261359 - Merging r261148:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Feb 19 13:43:25 2016
New Revision: 261359

URL: http://llvm.org/viewvc/llvm-project?rev=261359&view=rev
Log:
Merging r261148:
------------------------------------------------------------------------
r261148 | samsonov | 2016-02-17 12:40:10 -0800 (Wed, 17 Feb 2016) | 1 line

[TSan] PR26609: Fix two test cases.
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_38/   (props changed)
    compiler-rt/branches/release_38/test/tsan/ignore_lib0.cc
    compiler-rt/branches/release_38/test/tsan/printf-1.c

Propchange: compiler-rt/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 19 13:43:25 2016
@@ -1 +1 @@
-/compiler-rt/trunk:258916,259755,260669,260839,261073,261142,261193,261263
+/compiler-rt/trunk:258916,259755,260669,260839,261073,261142,261148,261193,261263

Modified: compiler-rt/branches/release_38/test/tsan/ignore_lib0.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/test/tsan/ignore_lib0.cc?rev=261359&r1=261358&r2=261359&view=diff
==============================================================================
--- compiler-rt/branches/release_38/test/tsan/ignore_lib0.cc (original)
+++ compiler-rt/branches/release_38/test/tsan/ignore_lib0.cc Fri Feb 19 13:43:25 2016
@@ -1,9 +1,9 @@
 // RUN: %clangxx_tsan -O1 %s -DLIB -fPIC -fno-sanitize=thread -shared -o %T/libignore_lib0.so
 // RUN: %clangxx_tsan -O1 %s -L%T -lignore_lib0 -o %t
 // RUN: echo running w/o suppressions:
-// RUN: LD_LIBRARY_PATH=%T${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %deflake %run %t | FileCheck %s --check-prefix=CHECK-NOSUPP
+// RUN: env LD_LIBRARY_PATH=%T${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %deflake %run %t | FileCheck %s --check-prefix=CHECK-NOSUPP
 // RUN: echo running with suppressions:
-// RUN: LD_LIBRARY_PATH=%T${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %env_tsan_opts=suppressions='%s.supp' %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-WITHSUPP
+// RUN: env LD_LIBRARY_PATH=%T${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %env_tsan_opts=suppressions='%s.supp' %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-WITHSUPP
 
 // Tests that interceptors coming from a library specified in called_from_lib
 // suppression are ignored.

Modified: compiler-rt/branches/release_38/test/tsan/printf-1.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/test/tsan/printf-1.c?rev=261359&r1=261358&r2=261359&view=diff
==============================================================================
--- compiler-rt/branches/release_38/test/tsan/printf-1.c (original)
+++ compiler-rt/branches/release_38/test/tsan/printf-1.c Fri Feb 19 13:43:25 2016
@@ -1,6 +1,6 @@
 // RUN: %clang_tsan -O2 %s -o %t
-// RUN: ASAN_OPTIONS=check_printf=1 %run %t 2>&1 | FileCheck %s
-// RUN: ASAN_OPTIONS=check_printf=0 %run %t 2>&1 | FileCheck %s
+// RUN: %env_tsan_opts=check_printf=1 %run %t 2>&1 | FileCheck %s
+// RUN: %env_tsan_opts=check_printf=0 %run %t 2>&1 | FileCheck %s
 // RUN: %run %t 2>&1 | FileCheck %s
 
 #include <stdio.h>