This is an archive of the discontinued LLVM Phabricator instance.

Differential D34624

extra test modifications for D34158
ClosedPublic

Authored by mibintc on Jun 26 2017, 8:12 AM.

Details

Reviewers
erichkeane
jyknight
Group Reviewers
Restricted Project
Commits
rG991447d6f892: extra test modifications for D34158
rCTE318668: extra test modifications for D34158
rL318668: extra test modifications for D34158
Summary

When adding support for D34158 which changes preprocessed output, I needed to make tiny test corrections for these. Adding the option -ffreestanding suppresses the new behavior, and that's the change I made to fix the tests.

Diff Detail

Repository
rL LLVM

Event Timeline

mibintc created this revision.Jun 26 2017, 8:12 AM
mibintc added a parent revision: D34158: For Linux/gnu compatibility, preinclude <stdc-predef.h> if the file is available .Jun 26 2017, 8:15 AM
malcolm.parsons added a subscriber: cfe-commits.Jun 26 2017, 8:18 AM
mibintc updated this revision to Diff 105852.Jul 10 2017, 8:11 AM

With the latest proposed fix for D34158, a few more test corrections are needed. The correction consists of suppressing the new preprocessor behavior. D34158 preincludes the file <stdc-predef.h> if the file is available.

mibintc planned changes to this revision.Jul 10 2017, 12:42 PM

I need to redo the test changes. Will resubmit the diff.

mibintc updated this revision to Diff 105906.Jul 10 2017, 1:12 PM
mibintc edited the summary of this revision. (Show Details)

This patch corresponds to these modifications to clang: https://reviews.llvm.org/D34158?id=105904

mibintc updated this revision to Diff 110059.Aug 7 2017, 12:55 PM

Updating this patch to latest revision of tools/extra

mibintc updated this revision to Diff 114887.Sep 12 2017, 1:06 PM

Updating to latest version. No change other than that.

mibintc updated this revision to Diff 120584.Oct 27 2017, 6:18 AM

Updated the test diff to correspond to the D34158 patch uploaded today.

mibintc added reviewers: erichkeane, jyknight.Oct 27 2017, 6:19 AM
Closed by commit rL318668: extra test modifications for D34158 (authored by erichkeane). · Explain WhyNov 20 2017, 9:59 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang-tools-extra/
trunk/
test/
pp-trace/
2 lines
2 lines

Diff 123612

clang-tools-extra/trunk/test/pp-trace/pp-trace-pragma-general.cpp

// RUN: pp-trace -ignore FileChanged,MacroDefined %s | FileCheck --strict-whitespace %s // RUN: pp-trace -ignore FileChanged,MacroDefined %s -ffreestanding | FileCheck --strict-whitespace %s
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic pop #pragma clang diagnostic pop
#pragma clang diagnostic ignored "-Wformat" #pragma clang diagnostic ignored "-Wformat"
#pragma clang diagnostic warning "-Wformat" #pragma clang diagnostic warning "-Wformat"
#pragma clang diagnostic error "-Wformat" #pragma clang diagnostic error "-Wformat"
#pragma clang diagnostic fatal "-Wformat" #pragma clang diagnostic fatal "-Wformat"
▲ Show 20 Lines • Show All 109 Lines • Show Last 20 Lines

clang-tools-extra/trunk/test/pp-trace/pp-trace-pragma-opencl.cpp

// RUN: pp-trace -ignore FileChanged,MacroDefined %s -x cl | FileCheck --strict-whitespace %s // RUN: pp-trace -ignore FileChanged,MacroDefined %s -ffreestanding -x cl | FileCheck --strict-whitespace %s
#pragma OPENCL EXTENSION all : disable #pragma OPENCL EXTENSION all : disable
#pragma OPENCL EXTENSION cl_khr_int64_base_atomics : disable #pragma OPENCL EXTENSION cl_khr_int64_base_atomics : disable
#pragma OPENCL EXTENSION cl_khr_int64_base_atomics : enable #pragma OPENCL EXTENSION cl_khr_int64_base_atomics : enable
// CHECK: --- // CHECK: ---
// CHECK-NEXT: - Callback: PragmaDirective // CHECK-NEXT: - Callback: PragmaDirective
// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-pragma-opencl.cpp:3:1" // CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-pragma-opencl.cpp:3:1"
Show All 24 Lines