thopre updated this revision to Diff 233712.
thopre added a comment.
Herald added subscribers: Sanitizers, cfe-commits, luismarques, apazos,
sameer.abuasal, pzheng, s.egerton, lenary, jocewei, PkmX, the_o, brucehoult,
MartinMosbeck, rogfer01, edward-jones, zzheng, jrtc27, delcypher, niosHD,
sabuasal, simoncook, johnrusso, rbar, asb.
Herald added projects: clang, Sanitizers.
Remove REQUIRES-ANY lit directive
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D71408/new/
https://reviews.llvm.org/D71408
Files:
clang/test/Driver/XRay/xray-instrument-macos.c
clang/test/Driver/XRay/xray-instrument-os.c
clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp
clang/test/Driver/XRay/xray-mode-flags.cpp
clang/test/Driver/XRay/xray-nolinkdeps.cpp
compiler-rt/test/builtins/Unit/arm/aeabi_cdcmpeq_test.c
compiler-rt/test/builtins/Unit/arm/aeabi_cdcmple_test.c
compiler-rt/test/builtins/Unit/arm/aeabi_cfcmpeq_test.c
compiler-rt/test/builtins/Unit/arm/aeabi_cfcmple_test.c
compiler-rt/test/builtins/Unit/arm/aeabi_drsub_test.c
compiler-rt/test/builtins/Unit/arm/aeabi_frsub_test.c
compiler-rt/test/builtins/Unit/arm/aeabi_idivmod_test.c
compiler-rt/test/builtins/Unit/arm/aeabi_uidivmod_test.c
compiler-rt/test/builtins/Unit/arm/aeabi_uldivmod_test.c
compiler-rt/test/builtins/Unit/riscv/mulsi3_test.c
llvm/utils/lit/lit/TestRunner.py
llvm/utils/lit/tests/Inputs/shtest-format/requires-any-missing.txt
llvm/utils/lit/tests/Inputs/shtest-format/requires-any-present.txt
Index: llvm/utils/lit/tests/Inputs/shtest-format/requires-any-present.txt
===================================================================
--- llvm/utils/lit/tests/Inputs/shtest-format/requires-any-present.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-RUN: true
-REQUIRES-ANY: a-missing-feature, a-present-feature
Index: llvm/utils/lit/tests/Inputs/shtest-format/requires-any-missing.txt
===================================================================
--- llvm/utils/lit/tests/Inputs/shtest-format/requires-any-missing.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-RUN: true
-REQUIRES-ANY: a-missing-feature, a-missing-feature-2
Index: llvm/utils/lit/lit/TestRunner.py
===================================================================
--- llvm/utils/lit/lit/TestRunner.py
+++ llvm/utils/lit/lit/TestRunner.py
@@ -1304,20 +1304,6 @@
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 @@
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)
Index: compiler-rt/test/builtins/Unit/riscv/mulsi3_test.c
===================================================================
--- compiler-rt/test/builtins/Unit/riscv/mulsi3_test.c
+++ compiler-rt/test/builtins/Unit/riscv/mulsi3_test.c
@@ -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 -------------------------------------===//
//
Index: compiler-rt/test/builtins/Unit/arm/aeabi_uldivmod_test.c
===================================================================
--- compiler-rt/test/builtins/Unit/arm/aeabi_uldivmod_test.c
+++ compiler-rt/test/builtins/Unit/arm/aeabi_uldivmod_test.c
@@ -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 -----------------------===//
//
Index: compiler-rt/test/builtins/Unit/arm/aeabi_uidivmod_test.c
===================================================================
--- compiler-rt/test/builtins/Unit/arm/aeabi_uidivmod_test.c
+++ compiler-rt/test/builtins/Unit/arm/aeabi_uidivmod_test.c
@@ -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 ---------------------===//
//
Index: compiler-rt/test/builtins/Unit/arm/aeabi_idivmod_test.c
===================================================================
--- compiler-rt/test/builtins/Unit/arm/aeabi_idivmod_test.c
+++ compiler-rt/test/builtins/Unit/arm/aeabi_idivmod_test.c
@@ -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 -----------------------===//
//
Index: compiler-rt/test/builtins/Unit/arm/aeabi_frsub_test.c
===================================================================
--- compiler-rt/test/builtins/Unit/arm/aeabi_frsub_test.c
+++ compiler-rt/test/builtins/Unit/arm/aeabi_frsub_test.c
@@ -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 --------------------------------===//
//
Index: compiler-rt/test/builtins/Unit/arm/aeabi_drsub_test.c
===================================================================
--- compiler-rt/test/builtins/Unit/arm/aeabi_drsub_test.c
+++ compiler-rt/test/builtins/Unit/arm/aeabi_drsub_test.c
@@ -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 --------------------------------===//
//
Index: compiler-rt/test/builtins/Unit/arm/aeabi_cfcmple_test.c
===================================================================
--- compiler-rt/test/builtins/Unit/arm/aeabi_cfcmple_test.c
+++ compiler-rt/test/builtins/Unit/arm/aeabi_cfcmple_test.c
@@ -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
Index: compiler-rt/test/builtins/Unit/arm/aeabi_cfcmpeq_test.c
===================================================================
--- compiler-rt/test/builtins/Unit/arm/aeabi_cfcmpeq_test.c
+++ compiler-rt/test/builtins/Unit/arm/aeabi_cfcmpeq_test.c
@@ -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 ----------------------------===//
Index: compiler-rt/test/builtins/Unit/arm/aeabi_cdcmple_test.c
===================================================================
--- compiler-rt/test/builtins/Unit/arm/aeabi_cdcmple_test.c
+++ compiler-rt/test/builtins/Unit/arm/aeabi_cdcmple_test.c
@@ -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
Index: compiler-rt/test/builtins/Unit/arm/aeabi_cdcmpeq_test.c
===================================================================
--- compiler-rt/test/builtins/Unit/arm/aeabi_cdcmpeq_test.c
+++ compiler-rt/test/builtins/Unit/arm/aeabi_cdcmpeq_test.c
@@ -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 ----------------------------===//
Index: clang/test/Driver/XRay/xray-nolinkdeps.cpp
===================================================================
--- clang/test/Driver/XRay/xray-nolinkdeps.cpp
+++ clang/test/Driver/XRay/xray-nolinkdeps.cpp
@@ -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
Index: clang/test/Driver/XRay/xray-mode-flags.cpp
===================================================================
--- clang/test/Driver/XRay/xray-mode-flags.cpp
+++ clang/test/Driver/XRay/xray-mode-flags.cpp
@@ -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
Index: clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp
===================================================================
--- clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp
+++ clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp
@@ -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
Index: clang/test/Driver/XRay/xray-instrument-os.c
===================================================================
--- clang/test/Driver/XRay/xray-instrument-os.c
+++ clang/test/Driver/XRay/xray-instrument-os.c
@@ -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;
Index: clang/test/Driver/XRay/xray-instrument-macos.c
===================================================================
--- clang/test/Driver/XRay/xray-instrument-macos.c
+++ clang/test/Driver/XRay/xray-instrument-macos.c
@@ -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;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
