From 31144351686fc1fab9155f29fa61479862887b9f Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Wed, 5 Feb 2020 15:36:43 +0000 Subject: [PATCH] Re-enable a update_cc_test_checks.py tests This test was not running because it still had a REQUIRES: python3 line. As this is no longer necessary, remove the REQUIRES to run the test again. --- .../Inputs/mangled_names.c.funcsig.expected | 10 +++++----- .../UpdateTestChecks/update_cc_test_checks/mangled_names.test | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/llvm/test/tools/UpdateTestChecks/update_cc_test_checks/Inputs/mangled_names.c.funcsig.expected b/llvm/test/tools/UpdateTestChecks/update_cc_test_checks/Inputs/mangled_names.c.funcsig.expected index ef63403..005b2f2 100644 --- a/llvm/test/tools/UpdateTestChecks/update_cc_test_checks/Inputs/mangled_names.c.funcsig.expected +++ b/llvm/test/tools/UpdateTestChecks/update_cc_test_checks/Inputs/mangled_names.c.funcsig.expected @@ -7,8 +7,8 @@ // CHECK-NEXT: entry: // CHECK-NEXT: [[A_ADDR:%.*]] = alloca i64, align 8 // CHECK-NEXT: [[B_ADDR:%.*]] = alloca i32, align 4 -// CHECK-NEXT: store i64 [[A:%.*]], i64* [[A_ADDR]], align 8 -// CHECK-NEXT: store i32 [[B:%.*]], i32* [[B_ADDR]], align 4 +// CHECK-NEXT: store i64 [[A]], i64* [[A_ADDR]], align 8 +// CHECK-NEXT: store i32 [[B]], i32* [[B_ADDR]], align 4 // CHECK-NEXT: [[TMP0:%.*]] = load i64, i64* [[A_ADDR]], align 8 // CHECK-NEXT: [[TMP1:%.*]] = load i32, i32* [[B_ADDR]], align 4 // CHECK-NEXT: [[CONV:%.*]] = sext i32 [[TMP1]] to i64 @@ -26,9 +26,9 @@ long test(long a, int b) { // CHECK-NEXT: [[A_ADDR:%.*]] = alloca i64, align 8 // CHECK-NEXT: [[B_ADDR:%.*]] = alloca i32, align 4 // CHECK-NEXT: [[C_ADDR:%.*]] = alloca i32, align 4 -// CHECK-NEXT: store i64 [[A:%.*]], i64* [[A_ADDR]], align 8 -// CHECK-NEXT: store i32 [[B:%.*]], i32* [[B_ADDR]], align 4 -// CHECK-NEXT: store i32 [[C:%.*]], i32* [[C_ADDR]], align 4 +// CHECK-NEXT: store i64 [[A]], i64* [[A_ADDR]], align 8 +// CHECK-NEXT: store i32 [[B]], i32* [[B_ADDR]], align 4 +// CHECK-NEXT: store i32 [[C]], i32* [[C_ADDR]], align 4 // CHECK-NEXT: [[TMP0:%.*]] = load i64, i64* [[A_ADDR]], align 8 // CHECK-NEXT: [[TMP1:%.*]] = load i32, i32* [[B_ADDR]], align 4 // CHECK-NEXT: [[CONV:%.*]] = sext i32 [[TMP1]] to i64 diff --git a/llvm/test/tools/UpdateTestChecks/update_cc_test_checks/mangled_names.test b/llvm/test/tools/UpdateTestChecks/update_cc_test_checks/mangled_names.test index 4d2b66f..082ed74 100644 --- a/llvm/test/tools/UpdateTestChecks/update_cc_test_checks/mangled_names.test +++ b/llvm/test/tools/UpdateTestChecks/update_cc_test_checks/mangled_names.test @@ -1,10 +1,5 @@ ## Basic test checking that update_cc_test_checks.py works as expected for ## functions with mangled names - -# %update_cc_test_checks is only set if python3 is on the path. -# FIXME: Is this the best approach? See discussion on D70660. -# REQUIRES: python3 - # RUN: cp -f %S/Inputs/mangled_names.c %t.c && %update_cc_test_checks -v %t.c # RUN: diff -u %t.c %S/Inputs/mangled_names.c.expected ## Check that running the script again does not change the result: -- 2.7.4