Commit cf401074 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r261148: 

------------------------------------------------------------------------
r261148 | samsonov | 2016-02-17 12:40:10 -0800 (Wed, 17 Feb 2016) | 1 line

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

llvm-svn: 261359
parent cde5a9c7

compiler-rt/test/tsan/ignore_lib0.cc

+2 −2
Original line number Diff line number Diff line 
// 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.

compiler-rt/test/tsan/printf-1.c

+2 −2
Original line number Diff line number Diff line 
// 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>