From 617bb476352a6878b28b714834221d71051ec281 Mon Sep 17 00:00:00 2001 From: Mehdi Amini Date: Wed, 16 Sep 2015 17:03:12 +0000 Subject: [PATCH] Improve "default_triple" specification: make it at the directory level for test/tools/llvm-mc From: Mehdi Amini git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@247819 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/tools/llvm-mc/basic.test | 1 - test/tools/llvm-mc/fatal_warnings.test | 1 - test/tools/llvm-mc/line_end_with_space.test | 1 - test/tools/llvm-mc/lit.local.cfg | 3 ++- test/tools/llvm-mc/no_warnings.test | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/test/tools/llvm-mc/basic.test b/test/tools/llvm-mc/basic.test index cfc372ef044..edac65257e5 100644 --- a/test/tools/llvm-mc/basic.test +++ b/test/tools/llvm-mc/basic.test @@ -1,4 +1,3 @@ # RUN: not llvm-mc %t.blah -o %t2 2>&1 | FileCheck --check-prefix=ENOENT %s -# REQUIRES: default_triple # ENOENT: {{.*}}.blah: {{[Nn]}}o such file or directory diff --git a/test/tools/llvm-mc/fatal_warnings.test b/test/tools/llvm-mc/fatal_warnings.test index 3761ec4b26f..df73ad8b7cf 100644 --- a/test/tools/llvm-mc/fatal_warnings.test +++ b/test/tools/llvm-mc/fatal_warnings.test @@ -1,6 +1,5 @@ # RUN: not llvm-mc --fatal-warnings %s 2>&1 | FileCheck %s # XFAIL: hexagon -# REQUIRES: default_triple # CHECK: error: .warning directive invoked in source file .warning diff --git a/test/tools/llvm-mc/line_end_with_space.test b/test/tools/llvm-mc/line_end_with_space.test index 4c365f6a8d5..673d05a6806 100644 --- a/test/tools/llvm-mc/line_end_with_space.test +++ b/test/tools/llvm-mc/line_end_with_space.test @@ -1,2 +1 @@ RUN: llvm-mc -disassemble %s -# REQUIRES: default_triple diff --git a/test/tools/llvm-mc/lit.local.cfg b/test/tools/llvm-mc/lit.local.cfg index f22d4aabd73..a1bda0f1fdc 100644 --- a/test/tools/llvm-mc/lit.local.cfg +++ b/test/tools/llvm-mc/lit.local.cfg @@ -1,3 +1,4 @@ -if not config.target_triple: +# Requires a non-empty default triple for these tests +if 'default_triple' not in config.available_features: config.unsupported = True diff --git a/test/tools/llvm-mc/no_warnings.test b/test/tools/llvm-mc/no_warnings.test index 46549c4710d..f542f1773c0 100644 --- a/test/tools/llvm-mc/no_warnings.test +++ b/test/tools/llvm-mc/no_warnings.test @@ -1,6 +1,5 @@ # RUN: llvm-mc --no-warn %s 2>&1 | FileCheck %s # XFAIL: hexagon -# REQUIRES: default_triple # CHECK-NOT: warning: .warning