Re: [libcxx] r299652 - Restore Missing awk regex tests. Thanks to dexonsmith for noticing, and proposing this as https://reviews.llvm.org/D16541

[Mehdi Amini via cfe-commits]

Hi,

I reverted in r299656. MacOS bot is broken both on 64 and 32 bits:

http://green.lab.llvm.org/green/job/libcxx_master_cmake/83/
http://green.lab.llvm.org/green/job/libcxx_master_cmake_32/61/

It shouldn’t be too hard to fix though, it is full of the same error:

/Users/buildslave/jenkins/sharedspace/libcxx/libcxx.src/test/std/re/re.alg/re.alg.match/awk.pass.cpp:266:28:
 error: comparison of integers of different signs: 'difference_type' (aka 
'long') and 'size_t' (aka 'unsigned long') [-Werror,-Wsign-compare]

assert(m.length(0) == std::char_traits::length(s));
   ~~~ ^  ~


— 
Mehdi






> On Apr 6, 2017, at 7:32 AM, Marshall Clow via cfe-commits 
>  wrote:
> 
> Author: marshall
> Date: Thu Apr  6 09:32:42 2017
> New Revision: 299652
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=299652=rev
> Log:
> Restore Missing awk regex tests. Thanks to dexonsmith for noticing, and 
> proposing this as https://reviews.llvm.org/D16541
> 
> Modified:
>libcxx/trunk/test/std/re/re.alg/re.alg.match/awk.pass.cpp
> 
> Modified: libcxx/trunk/test/std/re/re.alg/re.alg.match/awk.pass.cpp
> URL: 
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/re/re.alg/re.alg.match/awk.pass.cpp?rev=299652=299651=299652=diff
> ==
> --- libcxx/trunk/test/std/re/re.alg/re.alg.match/awk.pass.cpp (original)
> +++ libcxx/trunk/test/std/re/re.alg/re.alg.match/awk.pass.cpp Thu Apr  6 
> 09:32:42 2017
> @@ -26,7 +26,7 @@
> 
> int main()
> {
> -/*{
> +{
> std::cmatch m;
> const char s[] = "a";
> assert(std::regex_match(s, m, std::regex("a", 
> std::regex_constants::awk)));
> @@ -616,13 +616,12 @@ int main()
> assert(m.size() == 0);
> }
> std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2));
> -*/{
> -/*
> +{
> std::cmatch m;
> const char s[] = "m";
> -assert(std::regex_match(s, m, std::regex("[a[=M=]z]",
> - std::regex_constants::awk);
> -   assert(m.size() == 1);
> +assert(std::regex_match(s, m, 
> +  std::regex("[a[=M=]z]", std::regex_constants::awk)));
> +assert(m.size() == 1);
> assert(!m.prefix().matched);
> assert(m.prefix().first == s);
> assert(m.prefix().second == m[0].first);
> @@ -632,8 +631,8 @@ int main()
> assert(m.length(0) == std::char_traits::length(s));
> assert(m.position(0) == 0);
> assert(m.str(0) == s);
> -*/}
> -/*{
> +}
> +{
> std::cmatch m;
> const char s[] = "Ch";
> assert(std::regex_match(s, m, std::regex("[a[.ch.]z]",
> @@ -1389,4 +1388,4 @@ int main()
> assert(m.position(0) == 0);
> assert(m.str(0) == s);
> }
> -*/}
> +}
> 
> 
> ___
> cfe-commits mailing list
> cfe-commits@lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[libcxx] r299652 - Restore Missing awk regex tests. Thanks to dexonsmith for noticing, and proposing this as https://reviews.llvm.org/D16541

[Marshall Clow via cfe-commits]

Author: marshall
Date: Thu Apr  6 09:32:42 2017
New Revision: 299652

URL: http://llvm.org/viewvc/llvm-project?rev=299652=rev
Log:
Restore Missing awk regex tests. Thanks to dexonsmith for noticing, and 
proposing this as https://reviews.llvm.org/D16541

Modified:
libcxx/trunk/test/std/re/re.alg/re.alg.match/awk.pass.cpp

Modified: libcxx/trunk/test/std/re/re.alg/re.alg.match/awk.pass.cpp
URL: 
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/re/re.alg/re.alg.match/awk.pass.cpp?rev=299652=299651=299652=diff
==
--- libcxx/trunk/test/std/re/re.alg/re.alg.match/awk.pass.cpp (original)
+++ libcxx/trunk/test/std/re/re.alg/re.alg.match/awk.pass.cpp Thu Apr  6 
09:32:42 2017
@@ -26,7 +26,7 @@
 
 int main()
 {
-/*{
+{
 std::cmatch m;
 const char s[] = "a";
 assert(std::regex_match(s, m, std::regex("a", 
std::regex_constants::awk)));
@@ -616,13 +616,12 @@ int main()
 assert(m.size() == 0);
 }
 std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2));
-*/{
-/*
+{
 std::cmatch m;
 const char s[] = "m";
-assert(std::regex_match(s, m, std::regex("[a[=M=]z]",
- std::regex_constants::awk);
-   assert(m.size() == 1);
+assert(std::regex_match(s, m, 
+  std::regex("[a[=M=]z]", std::regex_constants::awk)));
+assert(m.size() == 1);
 assert(!m.prefix().matched);
 assert(m.prefix().first == s);
 assert(m.prefix().second == m[0].first);
@@ -632,8 +631,8 @@ int main()
 assert(m.length(0) == std::char_traits::length(s));
 assert(m.position(0) == 0);
 assert(m.str(0) == s);
-*/}
-/*{
+}
+{
 std::cmatch m;
 const char s[] = "Ch";
 assert(std::regex_match(s, m, std::regex("[a[.ch.]z]",
@@ -1389,4 +1388,4 @@ int main()
 assert(m.position(0) == 0);
 assert(m.str(0) == s);
 }
-*/}
+}


___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits