This is an archive of the discontinued LLVM Phabricator instance.

Differential D56069

[arcmigrator] [NFC] Change arc migrator to use "diff" instead of a custom script
AbandonedPublic

Authored by george.karpenkov on Dec 24 2018, 5:05 PM.

Details

Reviewers
dcoughlin
NoQ
Summary

...so that the error message would actually show the difference instead of "too bad, files differ".

Diff Detail

Event Timeline

george.karpenkov created this revision.Dec 24 2018, 5:05 PM
NoQ accepted this revision.Jan 8 2019, 4:40 PM

Nice!

This revision is now accepted and ready to land.Jan 8 2019, 4:40 PM
george.karpenkov planned changes to this revision.Jan 10 2019, 10:10 AM

Actually OTOH I've just noticed that all the other tests use c-arcmt-test, so it does not quite make sense to only port two files out of dozens.

george.karpenkov abandoned this revision.Nov 20 2019, 5:56 PM
Herald added subscribers: sanjoy.google, Charusso. · View Herald TranscriptNov 20 2019, 5:56 PM

Revision Contents

Diff 179482

clang/test/ARCMT/objcmt-arc-cf-annotations.m

// RUN: rm -rf %t // RUN: rm -rf %t
// RUN: %clang_cc1 -fblocks -objcmt-migrate-annotation -objcmt-migrate-instancetype -objcmt-migrate-readwrite-property -mt-migrate-directory %t %s -x objective-c -triple x86_64-apple-darwin11 // RUN: %clang_cc1 -fblocks -objcmt-migrate-annotation -objcmt-migrate-instancetype -objcmt-migrate-readwrite-property -mt-migrate-directory %t %s -x objective-c -triple x86_64-apple-darwin11
// RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %s.result // RUN: c-arcmt-test -mt-migrate-directory %t | tail -n 1 | xargs cat | diff -u -w %s.result -
// RUN: %clang_cc1 -fblocks -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s.result
#ifndef CF_IMPLICIT_BRIDGING_ENABLED #ifndef CF_IMPLICIT_BRIDGING_ENABLED
#if __has_feature(arc_cf_code_audited) #if __has_feature(arc_cf_code_audited)
#define CF_IMPLICIT_BRIDGING_ENABLED _Pragma("clang arc_cf_code_audited begin") #define CF_IMPLICIT_BRIDGING_ENABLED _Pragma("clang arc_cf_code_audited begin")
#else #else
#define CF_IMPLICIT_BRIDGING_ENABLED #define CF_IMPLICIT_BRIDGING_ENABLED
#endif #endif
#endif #endif
▲ Show 20 Lines • Show All 991 Lines • Show Last 20 Lines

clang/test/ARCMT/objcmt-arc-cf-annotations.m.result

// RUN: rm -rf %t // RUN: rm -rf %t
// RUN: %clang_cc1 -fblocks -objcmt-migrate-annotation -objcmt-migrate-instancetype -objcmt-migrate-readwrite-property -mt-migrate-directory %t %s -x objective-c -triple x86_64-apple-darwin11 // RUN: %clang_cc1 -fblocks -objcmt-migrate-annotation -objcmt-migrate-instancetype -objcmt-migrate-readwrite-property -mt-migrate-directory %t %s -x objective-c -triple x86_64-apple-darwin11
// RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %s.result // RUN: c-arcmt-test -mt-migrate-directory %t | tail -n 1 | xargs cat | diff -u -w %s.result -
// RUN: %clang_cc1 -fblocks -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s.result
#ifndef CF_IMPLICIT_BRIDGING_ENABLED #ifndef CF_IMPLICIT_BRIDGING_ENABLED
#if __has_feature(arc_cf_code_audited) #if __has_feature(arc_cf_code_audited)
#define CF_IMPLICIT_BRIDGING_ENABLED _Pragma("clang arc_cf_code_audited begin") #define CF_IMPLICIT_BRIDGING_ENABLED _Pragma("clang arc_cf_code_audited begin")
#else #else
#define CF_IMPLICIT_BRIDGING_ENABLED #define CF_IMPLICIT_BRIDGING_ENABLED
#endif #endif
#endif #endif
▲ Show 20 Lines • Show All 991 Lines • Show Last 20 Lines