Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-04-01 12:43:47 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[lit] Remove lit's REQUIRES-ANY directive

Browse Source 
Summary:
Remove REQUIRES-ANY alias lit directive since it is hardly used and can
be easily implemented using an OR expression using REQUIRES. Fixup
remaining testcases still using REQUIRES-ANY.

Reviewers: probinson, jdenny, gparker42

Reviewed By: gparker42

Subscribers: eugenis, asb, rbar, johnrusso, simoncook, sabuasal, niosHD, delcypher, jrtc27, zzheng, edward-jones, rogfer01, MartinMosbeck, brucehoult, the_o, PkmX, jocewei, lenary, s.egerton, pzheng, sameer.abuasal, apazos, luismarques, cfe-commits, #sanitizers, llvm-commits

Tags: #llvm, #clang, #sanitizers

Differential Revision: https://reviews.llvm.org/D71408
This commit is contained in:
Thomas Preud'homme 2019-12-12 11:39:57 +00:00
parent d9ca412a8a
commit ddd0bb8dba
18 changed files with 18 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/test/Driver/XRay/xray-instrument-macos.c
View File

@ -1,4 +1,4 @@
// RUN: %clang -o /dev/null -v -fxray-instrument -target x86_64-apple-macos10.11 -c %s
// RUN: %clang -o /dev/null -v -fxray-instrument -target x86_64-apple-darwin15 -c %s
// REQUIRES-ANY: x86_64, x86_64h
// REQUIRES: x86_64 || x86_64h
typedef int a;

2
clang/test/Driver/XRay/xray-instrument-os.c
View File

@ -1,4 +1,4 @@
// RUN: not %clang -o /dev/null -v -fxray-instrument -c %s
// XFAIL: -linux-, -freebsd, -darwin, -macos
// REQUIRES-ANY: amd64, x86_64, x86_64h, arm, aarch64, arm64
// REQUIRES: amd64 || x86_64 || x86_64h || arm || aarch64 || arm64
typedef int a;

4
clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp
View File

@ -7,5 +7,5 @@
// RUN: | FileCheck %s
// CHECK: -fxray-instrumentation-bundle=function
//
// REQUIRES-ANY: linux, freebsd
// REQUIRES-ANY: amd64, x86_64, x86_64h, arm, aarch64, arm64
// REQUIRES: linux || freebsd
// REQUIRES: amd64 || x86_64 || x86_64h || arm || aarch64 || arm64

4
clang/test/Driver/XRay/xray-mode-flags.cpp
View File

@ -45,5 +45,5 @@
// FDR: libclang_rt.xray-fdr
// NONE-NOT: libclang_rt.xray-basic
// NONE-NOT: libclang_rt.xray-fdr
// REQUIRES-ANY: linux, freebsd
// REQUIRES-ANY: amd64, x86_64, x86_64h, arm, aarch64, arm64
// REQUIRES: linux || freebsd
// REQUIRES: amd64 || x86_64 || x86_64h || arm || aarch64 || arm64

4
clang/test/Driver/XRay/xray-nolinkdeps.cpp
View File

@ -4,5 +4,5 @@
// RUN: 2>&1 | FileCheck --check-prefix ENABLE %s
// ENABLE: clang_rt.xray
// DISABLE-NOT: clang_rt.xray
// REQUIRES-ANY: linux, freebsd
// REQUIRES-ANY: amd64, x86_64, x86_64h, arm, aarch64, arm64
// REQUIRES: linux || freebsd
// REQUIRES: amd64 || x86_64 || x86_64h || arm || aarch64 || arm64

2
compiler-rt/test/builtins/Unit/arm/aeabi_cdcmpeq_test.c
View File

@ -1,4 +1,4 @@
// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
// REQUIRES: arm-target-arch || armv6m-target-arch
// RUN: %arm_call_apsr -o %t.aspr.o
// RUN: %clang_builtins %s %t.aspr.o %librt -o %t && %run %t
//===-- aeabi_cdcmpeq.c - Test __aeabi_cdcmpeq ----------------------------===//

2
compiler-rt/test/builtins/Unit/arm/aeabi_cdcmple_test.c
View File

@ -1,4 +1,4 @@
// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
// REQUIRES: arm-target-arch || armv6m-target-arch
// RUN: %arm_call_apsr -o %t.aspr.o
// RUN: %clang_builtins %s %t.aspr.o %librt -o %t && %run %t

2
compiler-rt/test/builtins/Unit/arm/aeabi_cfcmpeq_test.c
View File

@ -1,4 +1,4 @@
// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
// REQUIRES: arm-target-arch || armv6m-target-arch
// RUN: %arm_call_apsr -o %t.aspr.o
// RUN: %clang_builtins %s %t.aspr.o %librt -o %t && %run %t
//===-- aeabi_cfcmpeq.c - Test __aeabi_cfcmpeq ----------------------------===//

2
compiler-rt/test/builtins/Unit/arm/aeabi_cfcmple_test.c
View File

@ -1,4 +1,4 @@
// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
// REQUIRES: arm-target-arch || armv6m-target-arch
// RUN: %arm_call_apsr -o %t.aspr.o
// RUN: %clang_builtins %s %t.aspr.o %librt -o %t && %run %t

2
compiler-rt/test/builtins/Unit/arm/aeabi_drsub_test.c
View File

@ -1,4 +1,4 @@
// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
// REQUIRES: arm-target-arch || armv6m-target-arch
// RUN: %clang_builtins %s %librt -o %t && %run %t
//===-- aeabi_drsub.c - Test __aeabi_drsub --------------------------------===//
//

2
compiler-rt/test/builtins/Unit/arm/aeabi_frsub_test.c
View File

@ -1,4 +1,4 @@
// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
// REQUIRES: arm-target-arch || armv6m-target-arch
// RUN: %clang_builtins %s %librt -o %t && %run %t
//===-- aeabi_frsub.c - Test __aeabi_frsub --------------------------------===//
//

2
compiler-rt/test/builtins/Unit/arm/aeabi_idivmod_test.c
View File

@ -1,4 +1,4 @@
// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
// REQUIRES: arm-target-arch || armv6m-target-arch
// RUN: %clang_builtins %s %librt -o %t && %run %t
//===-- aeabi_idivmod_test.c - Test __aeabi_idivmod -----------------------===//
//

2
compiler-rt/test/builtins/Unit/arm/aeabi_uidivmod_test.c
View File

@ -1,4 +1,4 @@
// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
// REQUIRES: arm-target-arch || armv6m-target-arch
// RUN: %clang_builtins %s %librt -o %t && %run %t
//===-- aeabi_uidivmod_test.c - Test __aeabi_uidivmod ---------------------===//
//

2
compiler-rt/test/builtins/Unit/arm/aeabi_uldivmod_test.c
View File

@ -1,4 +1,4 @@
// REQUIRES-ANY: arm-target-arch,armv6m-target-arch
// REQUIRES: arm-target-arch || armv6m-target-arch
// RUN: %clang_builtins %s %librt -o %t && %run %t
//===-- aeabi_uldivmod_test.c - Test aeabi_uldivmod -----------------------===//
//

2
compiler-rt/test/builtins/Unit/riscv/mulsi3_test.c
View File

@ -1,4 +1,4 @@
// REQUIRES-ANY: riscv32-target-arch
// REQUIRES: riscv32-target-arch
// RUN: %clang_builtins %s %librt -o %t && %run %t
//===-- mulsi3_test.c - Test __mulsi3 -------------------------------------===//
//

17
llvm/utils/lit/lit/TestRunner.py
View File

@ -1304,20 +1304,6 @@ class IntegratedTestKeywordParser(object):
BooleanExpression.evaluate(s, [])
return output
@staticmethod
def _handleRequiresAny(line_number, line, output):
"""A custom parser to transform REQUIRES-ANY: into REQUIRES:"""
# Extract the conditions specified in REQUIRES-ANY: as written.
conditions = []
IntegratedTestKeywordParser._handleList(line_number, line, conditions)
# Output a `REQUIRES: a || b || c` expression in its place.
expression = ' || '.join(conditions)
IntegratedTestKeywordParser._handleBooleanExpr(line_number,
expression, output)
return output
def parseIntegratedTestScript(test, additional_parsers=[],
require_script=True):
"""parseIntegratedTestScript - Scan an LLVM/Clang style integrated test
@ -1341,9 +1327,6 @@ def parseIntegratedTestScript(test, additional_parsers=[],
initial_value=test.xfails),
IntegratedTestKeywordParser('REQUIRES:', ParserKind.BOOLEAN_EXPR,
initial_value=test.requires),
IntegratedTestKeywordParser('REQUIRES-ANY:', ParserKind.CUSTOM,
IntegratedTestKeywordParser._handleRequiresAny,
initial_value=test.requires),
IntegratedTestKeywordParser('UNSUPPORTED:', ParserKind.BOOLEAN_EXPR,
initial_value=test.unsupported),
IntegratedTestKeywordParser('END.', ParserKind.TAG)

2
llvm/utils/lit/tests/Inputs/shtest-format/requires-any-missing.txt
View File

@ -1,2 +0,0 @@
RUN: true
REQUIRES-ANY: a-missing-feature, a-missing-feature-2

2
llvm/utils/lit/tests/Inputs/shtest-format/requires-any-present.txt
View File

@ -1,2 +0,0 @@
RUN: true
REQUIRES-ANY: a-missing-feature, a-present-feature