rpms/llvm
8
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/llvm.git synced 2024-11-24 09:32:42 +00:00
Code Issues 5 Projects Releases Packages Wiki Activity Actions

Revert "Add patch to fix some lit test failures"

Browse source 
This reverts commit 941133aae9.

This patch is not present in the nightly tarballs we use for snapshot
builds.
This commit is contained in:
Tom Stellard 2022-06-28 17:17:24 +00:00 committed by Timm Bäder
parent 155c43c335
commit 782f58c76f
1 changed files with 0 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
0001-lit-test-relaxed-GTEST_TOTAL_SHARDS-checking-for-som.patch
View file

@ -1,42 +0,0 @@
From 14d3021c10d0853a3ae9931b610afca6d385201e Mon Sep 17 00:00:00 2001
From: Yuanfang Chen <yuanfang.chen@sony.com>
Date: Mon, 27 Jun 2022 16:12:45 -0700
Subject: [PATCH] [lit][test] relaxed GTEST_TOTAL_SHARDS checking for some
googletests
For machines with a small number of cores, GTEST_TOTAL_SHARDS may be
lower than 6.
---
llvm/utils/lit/tests/googletest-crash.py | 2 +-
llvm/utils/lit/tests/googletest-format.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/llvm/utils/lit/tests/googletest-crash.py b/llvm/utils/lit/tests/googletest-crash.py
index d647d44afbcb..9034ac6394b2 100644
--- a/llvm/utils/lit/tests/googletest-crash.py
+++ b/llvm/utils/lit/tests/googletest-crash.py
@@ -7,7 +7,7 @@
# CHECK: *** TEST 'googletest-crash :: [[PATH]][[FILE]]/0{{.*}} FAILED ***
# CHECK-NEXT: Script(shard):
# CHECK-NEXT: --
-# CHECK-NEXT: GTEST_OUTPUT=json:[[JSON:[^[:space:]]*\.json]] GTEST_SHUFFLE=0 GTEST_TOTAL_SHARDS=6 GTEST_SHARD_INDEX=0 {{.*}}[[FILE]]
+# CHECK-NEXT: GTEST_OUTPUT=json:[[JSON:[^[:space:]]*\.json]] GTEST_SHUFFLE=0 GTEST_TOTAL_SHARDS={{[1-6]}} GTEST_SHARD_INDEX=0 {{.*}}[[FILE]]
# CHECK-NEXT: --
# CHECK-EMPTY:
# CHECK-NEXT: [----------] 4 test from FirstTest
diff --git a/llvm/utils/lit/tests/googletest-format.py b/llvm/utils/lit/tests/googletest-format.py
index 2dedaa5d76d4..b66e8998cb84 100644
--- a/llvm/utils/lit/tests/googletest-format.py
+++ b/llvm/utils/lit/tests/googletest-format.py
@@ -13,7 +13,7 @@
# CHECK: *** TEST 'googletest-format :: [[PATH]][[FILE]]/0{{.*}} FAILED ***
# CHECK-NEXT: Script(shard):
# CHECK-NEXT: --
-# CHECK-NEXT: GTEST_OUTPUT=json:{{[^[:space:]]*}} GTEST_SHUFFLE=1 GTEST_TOTAL_SHARDS=6 GTEST_SHARD_INDEX=0 GTEST_RANDOM_SEED=123 {{.*}}[[FILE]]
+# CHECK-NEXT: GTEST_OUTPUT=json:{{[^[:space:]]*}} GTEST_SHUFFLE=1 GTEST_TOTAL_SHARDS={{[1-6]}} GTEST_SHARD_INDEX=0 GTEST_RANDOM_SEED=123 {{.*}}[[FILE]]
# CHECK-NEXT: --
# CHECK-EMPTY:
# CHECK-NEXT: Script:
--
2.27.0