<div dir="ltr">Sean,<div><br></div><div>Thank you for your review. Replaced ASSERT_EQ with EXPECT_EQ in r291713.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jan 10, 2017 at 12:39 AM, Sean Silva <span dir="ltr"><<a href="mailto:chisophugis@gmail.com" target="_blank">chisophugis@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">I think that technically many (all?) of these should be EXPECT_EQ. I think ASSERT_EQ is reserved for errors where we "can't go on" if it fails (e.g. checking the size of a container is >=5, and then we later need to check something about vec[4]).</div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jan 9, 2017 at 2:55 PM, Rui Ueyama via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ruiu<br>
Date: Mon Jan 9 16:55:00 2017<br>
New Revision: 291494<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=291494&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject?rev=291494&view=rev</a><br>
Log:<br>
TarWriter: Fix a bug in Ustar header.<br>
<br>
If we split a filename into `Name` and `Prefix`, `Prefix` is at most<br>
145 bytes. We had a bug that didn't split a path correctly. This bug<br>
was pointed out by Rafael in the post commit review.<br>
<br>
This patch adds a unit test for TarWriter to verify the fix.<br>
<br>
Added:<br>
llvm/trunk/unittests/Support/T<wbr>arWriterTest.cpp<br>
Modified:<br>
llvm/trunk/lib/Support/TarWrit<wbr>er.cpp<br>
llvm/trunk/unittests/Support/C<wbr>MakeLists.txt<br>
<br>
Modified: llvm/trunk/lib/Support/TarWrit<wbr>er.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/TarWriter.cpp?rev=291494&r1=291493&r2=291494&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/lib/Support/<wbr>TarWriter.cpp?rev=291494&r1=<wbr>291493&r2=291494&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Support/TarWrit<wbr>er.cpp (original)<br>
+++ llvm/trunk/lib/Support/TarWrit<wbr>er.cpp Mon Jan 9 16:55:00 2017<br>
@@ -122,7 +122,7 @@ static void writePaxHeader(raw_fd_ostrea<br>
static std::pair<StringRef, StringRef> splitPath(StringRef Path) {<br>
if (Path.size() <= sizeof(UstarHeader::Name))<br>
return {"", Path};<br>
- size_t Sep = Path.rfind('/', sizeof(UstarHeader::Name) + 1);<br>
+ size_t Sep = Path.rfind('/', sizeof(UstarHeader::Prefix) + 1);<br>
if (Sep == StringRef::npos)<br>
return {"", Path};<br>
return {Path.substr(0, Sep), Path.substr(Sep + 1)};<br>
<br>
Modified: llvm/trunk/unittests/Support/C<wbr>MakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/CMakeLists.txt?rev=291494&r1=291493&r2=291494&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/unittests/Sup<wbr>port/CMakeLists.txt?rev=291494<wbr>&r1=291493&r2=291494&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/unittests/Support/C<wbr>MakeLists.txt (original)<br>
+++ llvm/trunk/unittests/Support/C<wbr>MakeLists.txt Mon Jan 9 16:55:00 2017<br>
@@ -43,10 +43,11 @@ add_llvm_unittest(SupportTests<br>
SpecialCaseListTest.cpp<br>
StringPool.cpp<br>
SwapByteOrderTest.cpp<br>
+ TarWriterTest.cpp<br>
TargetParserTest.cpp<br>
- Threading.cpp<br>
ThreadLocalTest.cpp<br>
ThreadPool.cpp<br>
+ Threading.cpp<br>
TimerTest.cpp<br>
TypeNameTest.cpp<br>
TrailingObjectsTest.cpp<br>
<br>
Added: llvm/trunk/unittests/Support/T<wbr>arWriterTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/TarWriterTest.cpp?rev=291494&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/unittests/Sup<wbr>port/TarWriterTest.cpp?rev=291<wbr>494&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/unittests/Support/T<wbr>arWriterTest.cpp (added)<br>
+++ llvm/trunk/unittests/Support/T<wbr>arWriterTest.cpp Mon Jan 9 16:55:00 2017<br>
@@ -0,0 +1,88 @@<br>
+//===- llvm/unittest/Support/TarWrite<wbr>rTest.cpp ----------------------------==<wbr>=//<br>
+//<br>
+// The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===------------------------<wbr>------------------------------<wbr>----------------===//<br>
+<br>
+#include "llvm/Support/FileSystem.h"<br>
+#include "llvm/Support/MemoryBuffer.h"<br>
+#include "llvm/Support/TarWriter.h"<br>
+#include "gtest/gtest.h"<br>
+<br>
+using namespace llvm;<br>
+namespace {<br>
+<br>
+struct UstarHeader {<br>
+ char Name[100];<br>
+ char Mode[8];<br>
+ char Uid[8];<br>
+ char Gid[8];<br>
+ char Size[12];<br>
+ char Mtime[12];<br>
+ char Checksum[8];<br>
+ char TypeFlag;<br>
+ char Linkname[100];<br>
+ char Magic[6];<br>
+ char Version[2];<br>
+ char Uname[32];<br>
+ char Gname[32];<br>
+ char DevMajor[8];<br>
+ char DevMinor[8];<br>
+ char Prefix[155];<br>
+ char Pad[12];<br>
+};<br>
+<br>
+class TarWriterTest : public ::testing::Test {};<br>
+<br>
+static UstarHeader create(StringRef Base, StringRef Filename) {<br>
+ // Create a temporary file.<br>
+ SmallString<128> Path;<br>
+ std::error_code EC =<br>
+ sys::fs::createTemporaryFile("<wbr>TarWriterTest", "tar", Path);<br>
+ EXPECT_FALSE((bool)EC);<br>
+<br>
+ // Create a tar file.<br>
+ Expected<std::unique_ptr<TarWr<wbr>iter>> TarOrErr = TarWriter::create(Path, Base);<br>
+ EXPECT_TRUE((bool)TarOrErr);<br>
+ std::unique_ptr<TarWriter> Tar = std::move(*TarOrErr);<br>
+ Tar->append(Filename, "contents");<br>
+ Tar.release();<br>
+<br>
+ // Read the tar file.<br>
+ ErrorOr<std::unique_ptr<Memory<wbr>Buffer>> MBOrErr = MemoryBuffer::getFile(Path);<br>
+ EXPECT_TRUE((bool)MBOrErr);<br>
+ std::unique_ptr<MemoryBuffer> MB = std::move(*MBOrErr);<br>
+ sys::fs::remove(Path);<br>
+ return *reinterpret_cast<const UstarHeader *>(MB->getBufferStart());<br>
+}<br>
+<br>
+TEST_F(TarWriterTest, Basics) {<br>
+ UstarHeader Hdr = create("base", "file");<br>
+ ASSERT_EQ("ustar", StringRef(Hdr.Magic));<br>
+ ASSERT_EQ("00", StringRef(Hdr.Version, 2));<br>
+ ASSERT_EQ("base/file", StringRef(Hdr.Name));<br>
+ ASSERT_EQ("00000000010", StringRef(Hdr.Size));<br>
+}<br>
+<br>
+TEST_F(TarWriterTest, LongFilename) {<br>
+ UstarHeader Hdr1 = create(<br>
+ "012345678", std::string(99, 'x') + "/" + std::string(44, 'x') + "/foo");<br>
+ ASSERT_EQ("foo", StringRef(Hdr1.Name));<br>
+ ASSERT_EQ("012345678/" + std::string(99, 'x') + "/" + std::string(44, 'x'),<br>
+ StringRef(Hdr1.Prefix));<br>
+<br>
+ UstarHeader Hdr2 = create(<br>
+ "012345678", std::string(99, 'x') + "/" + std::string(45, 'x') + "/foo");<br>
+ ASSERT_EQ("foo", StringRef(Hdr2.Name));<br>
+ ASSERT_EQ("012345678/" + std::string(99, 'x') + "/" + std::string(45, 'x'),<br>
+ StringRef(Hdr2.Prefix));<br>
+<br>
+ UstarHeader Hdr3 = create(<br>
+ "012345678", std::string(99, 'x') + "/" + std::string(46, 'x') + "/foo");<br>
+ ASSERT_EQ(std::string(46, 'x') + "/foo", StringRef(Hdr3.Name));<br>
+ ASSERT_EQ("012345678/" + std::string(99, 'x'), StringRef(Hdr3.Prefix));<br>
+}<br>
+}<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div>