From 4464d90ec6e1c9b26f5ef6edb9088c219b0647a1 Mon Sep 17 00:00:00 2001
From: Roman Lebedev <lebedev.ri@gmail.com>
Date: Wed, 22 Jul 2020 16:07:13 +0300
Subject: [PATCH] [NFC][Reduce] Rewrite remove-funcs.ll to use FileCheck, make
 it less fragile

---
 llvm/test/Reduce/Inputs/remove-funcs.py |  9 ---------
 llvm/test/Reduce/remove-funcs.ll        | 12 ++++++++----
 2 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100755 llvm/test/Reduce/Inputs/remove-funcs.py

diff --git a/llvm/test/Reduce/Inputs/remove-funcs.py b/llvm/test/Reduce/Inputs/remove-funcs.py
deleted file mode 100755
index 1d726c4..0000000
--- a/llvm/test/Reduce/Inputs/remove-funcs.py
+++ /dev/null
@@ -1,9 +0,0 @@
-
-import sys
-
-input = open(sys.argv[1], "r")
-for line in input:
-  if "@interesting" in line:
-    sys.exit(0)
-
-sys.exit(1) # IR isn't interesting
diff --git a/llvm/test/Reduce/remove-funcs.ll b/llvm/test/Reduce/remove-funcs.ll
index 59ffd84..a9b525d 100644
--- a/llvm/test/Reduce/remove-funcs.ll
+++ b/llvm/test/Reduce/remove-funcs.ll
@@ -1,23 +1,27 @@
 ; Test that llvm-reduce can remove uninteresting functions as well as
 ; their InstCalls.
 ;
-; RUN: llvm-reduce --test %python --test-arg %p/Inputs/remove-funcs.py %s -o %t
-; RUN: cat %t | FileCheck -implicit-check-not=uninteresting %s
+; RUN: llvm-reduce --test FileCheck --test-arg --check-prefixes=CHECK-ALL,CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: cat %t | FileCheck -implicit-check-not=uninteresting --check-prefixes=CHECK-ALL,CHECK-FINAL %s
 
 define i32 @uninteresting1() {
 entry:
   ret i32 0
 }
 
-; CHECK: interesting()
+; CHECK-ALL-LABEL: interesting()
 define i32 @interesting() {
 entry:
-  ; CHECK: call i32 @interesting()
+  ; CHECK-INTERESTINGNESS: call i32 @interesting()
   %call2 = call i32 @interesting()
   %call = call i32 @uninteresting1()
   ret i32 5
 }
 
+; CHECK-FINAL-NEXT: entry:
+; CHECK-FINAL-NEXT:   %call2 = call i32 @interesting()
+; CHECK-FINAL-NEXT: }
+
 define i32 @uninteresting2() {
 entry:
   ret i32 0
-- 
2.7.4