<div dir="ltr">Thanks Matthias. My apoligies, I lost track of this patch.</div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Aug 9, 2016 at 7:31 PM, Bruno Cardoso Lopes via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-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">Thanks Matthias!<br>
<div class="HOEnZb"><div class="h5"><br>
On Tue, Aug 9, 2016 at 6:02 PM, Matthias Braun via cfe-commits<br>
<<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br>
> Author: matze<br>
> Date: Tue Aug  9 20:02:28 2016<br>
> New Revision: 278191<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=278191&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=278191&view=rev</a><br>
> Log:<br>
> test/hard_link_count(): Fix test on darwin<br>
><br>
> The hard link count that stat reports are different between normal hfs and the<br>
> case sensitive variant. Accept both.<br>
><br>
> Modified:<br>
>     libcxx/trunk/test/std/<wbr>experimental/filesystem/fs.op.<wbr>funcs/fs.op.hard_lk_ct/hard_<wbr>link_count.pass.cpp<br>
><br>
> Modified: libcxx/trunk/test/std/<wbr>experimental/filesystem/fs.op.<wbr>funcs/fs.op.hard_lk_ct/hard_<wbr>link_count.pass.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp?rev=278191&r1=278190&r2=278191&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/libcxx/trunk/test/std/<wbr>experimental/filesystem/fs.op.<wbr>funcs/fs.op.hard_lk_ct/hard_<wbr>link_count.pass.cpp?rev=<wbr>278191&r1=278190&r2=278191&<wbr>view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- libcxx/trunk/test/std/<wbr>experimental/filesystem/fs.op.<wbr>funcs/fs.op.hard_lk_ct/hard_<wbr>link_count.pass.cpp (original)<br>
> +++ libcxx/trunk/test/std/<wbr>experimental/filesystem/fs.op.<wbr>funcs/fs.op.hard_lk_ct/hard_<wbr>link_count.pass.cpp Tue Aug  9 20:02:28 2016<br>
> @@ -45,18 +45,27 @@ TEST_CASE(hard_link_count_for_<wbr>file)<br>
><br>
>  TEST_CASE(hard_link_count_for_<wbr>directory)<br>
>  {<br>
> -    uintmax_t DirExpect = 3;<br>
> -    uintmax_t Dir3Expect = 2;<br>
> +    uintmax_t DirExpect = 3; // hard link from . .. and Dir2<br>
> +    uintmax_t Dir3Expect = 2; // hard link from . ..<br>
> +    uintmax_t DirExpectAlt = DirExpect;<br>
> +    uintmax_t Dir3ExpectAlt = Dir3Expect;<br>
>  #if defined(__APPLE__)<br>
> -    DirExpect += 2;<br>
> -    Dir3Expect += 1;<br>
> +    // Filesystems formatted with case sensitive hfs+ behave unixish as<br>
> +    // expected. Normal hfs+ filesystems report the number of directory<br>
> +    // entries instead.<br>
> +    DirExpectAlt = 5; // .  ..  Dir2  file1  file2<br>
> +    Dir3Expect = 3; // .  ..  file5<br>
>  #endif<br>
> -    TEST_CHECK(hard_link_count(<wbr>StaticEnv::Dir) == DirExpect);<br>
> -    TEST_CHECK(hard_link_count(<wbr>StaticEnv::Dir3) == Dir3Expect);<br>
> +    TEST_CHECK(hard_link_count(<wbr>StaticEnv::Dir) == DirExpect ||<br>
> +               hard_link_count(StaticEnv::<wbr>Dir) == DirExpectAlt);<br>
> +    TEST_CHECK(hard_link_count(<wbr>StaticEnv::Dir3) == Dir3Expect ||<br>
> +               hard_link_count(StaticEnv::<wbr>Dir3) == Dir3ExpectAlt);<br>
><br>
>      std::error_code ec;<br>
> -    TEST_CHECK(hard_link_count(<wbr>StaticEnv::Dir, ec) == DirExpect);<br>
> -    TEST_CHECK(hard_link_count(<wbr>StaticEnv::Dir3, ec) == Dir3Expect);<br>
> +    TEST_CHECK(hard_link_count(<wbr>StaticEnv::Dir, ec) == DirExpect ||<br>
> +               hard_link_count(StaticEnv::<wbr>Dir, ec) == DirExpectAlt);<br>
> +    TEST_CHECK(hard_link_count(<wbr>StaticEnv::Dir3, ec) == Dir3Expect ||<br>
> +               hard_link_count(StaticEnv::<wbr>Dir3, ec) == Dir3ExpectAlt);<br>
>  }<br>
>  TEST_CASE(hard_link_count_<wbr>increments_test)<br>
>  {<br>
><br>
><br>
> ______________________________<wbr>_________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
<br>
<br>
<br>
</div></div><span class="HOEnZb"><font color="#888888">--<br>
Bruno Cardoso Lopes<br>
<a href="http://www.brunocardoso.cc" rel="noreferrer" target="_blank">http://www.brunocardoso.cc</a><br>
</font></span><div class="HOEnZb"><div class="h5">______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</div></div></blockquote></div><br></div>