From 81cd7358a2ce411c99512d055e98d0b9dc119c14 Mon Sep 17 00:00:00 2001 From: Connie Zhu <60797237+connieyzhu@users.noreply.github.com> Date: Tue, 27 Aug 2024 10:37:51 -0700 Subject: [PATCH] [compiler-rt][test] Rewrote test to fix usage of export with 2 arguments (#106143) This patch fixes the incorrect usage of lit's built-in export command in this compiler-rt test. The export command only allows for one argument, but %env_asan_opts expands to "env ASAN_OPTIONS", which gives export two arguments instead of only one. Instead of using export, which propogates the environment variable value to all subsequent commands, the environment variable is manually set before all RUN lines following the original export line. This patch depends on https://github.com/llvm/llvm-project/pull/105961. Fixes https://github.com/llvm/llvm-project/issues/106142. --- .../asan/TestCases/Posix/high-address-dereference.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/compiler-rt/test/asan/TestCases/Posix/high-address-dereference.c b/compiler-rt/test/asan/TestCases/Posix/high-address-dereference.c index 845e126d3f89b9..37a7b1702e982e 100644 --- a/compiler-rt/test/asan/TestCases/Posix/high-address-dereference.c +++ b/compiler-rt/test/asan/TestCases/Posix/high-address-dereference.c @@ -5,12 +5,11 @@ // REQUIRES: x86_64-target-arch // RUN: %clang_asan %s -o %t -// RUN: export %env_asan_opts=print_scariness=1 -// RUN: not %run %t 0x0000000000000000 2>&1 | FileCheck %s --check-prefixes=ZERO,HINT-PAGE0 -// RUN: not %run %t 0x0000000000000FFF 2>&1 | FileCheck %s --check-prefixes=LOW1,HINT-PAGE0 -// RUN: not %run %t 0x0000000000001000 2>&1 | FileCheck %s --check-prefixes=LOW2,HINT-NONE -// RUN: not %run %t 0x4141414141414141 2>&1 | FileCheck %s --check-prefixes=HIGH,HINT-HIGHADDR -// RUN: not %run %t 0xFFFFFFFFFFFFFFFF 2>&1 | FileCheck %s --check-prefixes=MAX,HINT-HIGHADDR +// RUN: %env_asan_opts=print_scariness=1 not %run %t 0x0000000000000000 2>&1 | FileCheck %s --check-prefixes=ZERO,HINT-PAGE0 +// RUN: %env_asan_opts=print_scariness=1 not %run %t 0x0000000000000FFF 2>&1 | FileCheck %s --check-prefixes=LOW1,HINT-PAGE0 +// RUN: %env_asan_opts=print_scariness=1 not %run %t 0x0000000000001000 2>&1 | FileCheck %s --check-prefixes=LOW2,HINT-NONE +// RUN: %env_asan_opts=print_scariness=1 not %run %t 0x4141414141414141 2>&1 | FileCheck %s --check-prefixes=HIGH,HINT-HIGHADDR +// RUN: %env_asan_opts=print_scariness=1 not %run %t 0xFFFFFFFFFFFFFFFF 2>&1 | FileCheck %s --check-prefixes=MAX,HINT-HIGHADDR #include #include