diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-08-26 23:20:23 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-08-26 23:20:23 +0000 |
| commit | 104543052561b372d16da2593fa2ca5c0cf138cc (patch) | |
| tree | b256ae834888b2b4b60634f3a25092e6b3221e66 /clang | |
| parent | 6c70e58041e47808672d5b75cd28fdbf0807bf76 (diff) | |
| download | bcm5719-llvm-104543052561b372d16da2593fa2ca5c0cf138cc.tar.gz bcm5719-llvm-104543052561b372d16da2593fa2ca5c0cf138cc.zip | |
[arcmt] Add a test case for r138671 and improve the loop.
llvm-svn: 138674
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/ARCMigrate/FileRemapper.cpp | 5 | ||||
| -rw-r--r-- | clang/test/ARCMT/migrate-space-in-path.m | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/clang/lib/ARCMigrate/FileRemapper.cpp b/clang/lib/ARCMigrate/FileRemapper.cpp index e255e40c19c..33a1db4d837 100644 --- a/clang/lib/ARCMigrate/FileRemapper.cpp +++ b/clang/lib/ARCMigrate/FileRemapper.cpp @@ -68,8 +68,7 @@ bool FileRemapper::initFromDisk(StringRef outputDir, Diagnostic &Diag, SmallVector<StringRef, 64> lines; fileBuf->getBuffer().split(lines, "\n"); - unsigned idx = 0; - while (idx+3 <= lines.size()) { + for (unsigned idx = 0; idx+3 <= lines.size(); idx += 3) { std::string fromFilename = lines[idx]; uint64_t timeModified; lines[idx+1].getAsInteger(10, timeModified); @@ -95,8 +94,6 @@ bool FileRemapper::initFromDisk(StringRef outputDir, Diagnostic &Diag, } pairs.push_back(std::make_pair(origFE, newFE)); - - idx += 3; } for (unsigned i = 0, e = pairs.size(); i != e; ++i) diff --git a/clang/test/ARCMT/migrate-space-in-path.m b/clang/test/ARCMT/migrate-space-in-path.m new file mode 100644 index 00000000000..1e2f6380e10 --- /dev/null +++ b/clang/test/ARCMT/migrate-space-in-path.m @@ -0,0 +1,7 @@ +// RUN: mkdir -p %t/"with space" +// RUN: cp %S/Inputs/* %t/"with space" +// RUN: %clang_cc1 -arcmt-migrate -arcmt-migrate-directory %t.migrate %t/"with space"/test1.m.in -x objective-c -fobjc-nonfragile-abi +// RUN: %clang_cc1 -arcmt-migrate -arcmt-migrate-directory %t.migrate %t/"with space"/test2.m.in -x objective-c -fobjc-nonfragile-abi +// RUN: c-arcmt-test -arcmt-migrate-directory %t.migrate | arcmt-test -verify-transformed-files %t/"with space"/test1.m.in.result %t/"with space"/test2.m.in.result %t/"with space"/test.h.result +// RUN: rm -rf %t.migrate +// RUN: rm -rf %t |
