summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/strings/basic.string/string.modifiers/string_append
diff options
context:
space:
mode:
authorJF Bastien <jfbastien@apple.com>2019-02-04 20:31:13 +0000
committerJF Bastien <jfbastien@apple.com>2019-02-04 20:31:13 +0000
commit2df59c50688c122bbcae7467d3eaf862c3ea3088 (patch)
tree29c9a3e1c54fe76a506ffecc0cc4d8fbaba5cb04 /libcxx/test/std/strings/basic.string/string.modifiers/string_append
parent6fd4e7fe0258ff71fe759535236883ea9060587c (diff)
downloadbcm5719-llvm-2df59c50688c122bbcae7467d3eaf862c3ea3088.tar.gz
bcm5719-llvm-2df59c50688c122bbcae7467d3eaf862c3ea3088.zip
Support tests in freestanding
Summary: Freestanding is *weird*. The standard allows it to differ in a bunch of odd manners from regular C++, and the committee would like to improve that situation. I'd like to make libc++ behave better with what freestanding should be, so that it can be a tool we use in improving the standard. To do that we need to try stuff out, both with "freestanding the language mode" and "freestanding the library subset". Let's start with the super basic: run the libc++ tests in freestanding, using clang as the compiler, and see what works. The easiest hack to do this: In utils/libcxx/test/config.py add: self.cxx.compile_flags += ['-ffreestanding'] Run the tests and they all fail. Why? Because in freestanding `main` isn't special. This "not special" property has two effects: main doesn't get mangled, and main isn't allowed to omit its `return` statement. The first means main gets mangled and the linker can't create a valid executable for us to test. The second means we spew out warnings (ew) and the compiler doesn't insert the `return` we omitted, and main just falls of the end and does whatever undefined behavior (if you're luck, ud2 leading to non-zero return code). Let's start my work with the basics. This patch changes all libc++ tests to declare `main` as `int main(int, char**` so it mangles consistently (enabling us to declare another `extern "C"` main for freestanding which calls the mangled one), and adds `return 0;` to all places where it was missing. This touches 6124 files, and I apologize. The former was done with The Magic Of Sed. The later was done with a (not quite correct but decent) clang tool: https://gist.github.com/jfbastien/793819ff360baa845483dde81170feed This works for most tests, though I did have to adjust a few places when e.g. the test runs with `-x c`, macros are used for main (such as for the filesystem tests), etc. Once this is in we can create a freestanding bot which will prevent further regressions. After that, we can start the real work of supporting C++ freestanding fairly well in libc++. <rdar://problem/47754795> Reviewers: ldionne, mclow.lists, EricWF Subscribers: christof, jkorous, dexonsmith, arphaman, miyuki, libcxx-commits Differential Revision: https://reviews.llvm.org/D57624 llvm-svn: 353086
Diffstat (limited to 'libcxx/test/std/strings/basic.string/string.modifiers/string_append')
-rw-r--r--libcxx/test/std/strings/basic.string/string.modifiers/string_append/T_size_size.pass.cpp4
-rw-r--r--libcxx/test/std/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp4
-rw-r--r--libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp4
-rw-r--r--libcxx/test/std/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp4
-rw-r--r--libcxx/test/std/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp4
-rw-r--r--libcxx/test/std/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp4
-rw-r--r--libcxx/test/std/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp4
-rw-r--r--libcxx/test/std/strings/basic.string/string.modifiers/string_append/string.pass.cpp4
-rw-r--r--libcxx/test/std/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp4
-rw-r--r--libcxx/test/std/strings/basic.string/string.modifiers/string_append/string_view.pass.cpp4
10 files changed, 30 insertions, 10 deletions
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/T_size_size.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/T_size_size.pass.cpp
index f2848295baf..43752406362 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/T_size_size.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/T_size_size.pass.cpp
@@ -71,7 +71,7 @@ test_npos(S s, SV sv, typename S::size_type pos, S expected)
#endif
}
-int main()
+int main(int, char**)
{
{
typedef std::string S;
@@ -196,4 +196,6 @@ int main()
s.append(sv, 0, std::string::npos);
assert(s == "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ");
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
index 04483865d56..da74fb4e09c 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp
@@ -18,7 +18,7 @@
#include "test_macros.h"
#include "min_allocator.h"
-int main()
+int main(int, char**)
{
{
std::string s("123");
@@ -31,4 +31,6 @@ int main()
s.append({'a', 'b', 'c'});
assert(s == "123abc");
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
index 08f554b34d4..8f280e828d9 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
@@ -42,7 +42,7 @@ test_exceptions(S s, It first, It last)
}
#endif
-int main()
+int main(int, char**)
{
{
typedef std::string S;
@@ -219,4 +219,6 @@ int main()
s.append(MoveIt(It(std::begin(p))), MoveIt(It(std::end(p) - 1)));
assert(s == "ABCD");
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
index dec79a67cd1..eba693d0e3d 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp
@@ -26,7 +26,7 @@ test(S s, const typename S::value_type* str, S expected)
assert(s == expected);
}
-int main()
+int main(int, char**)
{
{
typedef std::string S;
@@ -76,4 +76,6 @@ int main()
s_long.append(s_long.c_str());
assert(s_long == "Lorem ipsum dolor sit amet, consectetur/Lorem ipsum dolor sit amet, consectetur/");
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
index 2fb973ae983..c214ab7c2ac 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp
@@ -27,7 +27,7 @@ test(S s, const typename S::value_type* str, typename S::size_type n, S expected
assert(s == expected);
}
-int main()
+int main(int, char**)
{
{
typedef std::string S;
@@ -85,4 +85,6 @@ int main()
s_long.append(s_long.data(), s_long.size());
assert(s_long == "Lorem ipsum dolor sit amet, consectetur/Lorem ipsum dolor sit amet, consectetur/");
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
index a2b9ad1e470..f1b34ad6cff 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp
@@ -31,7 +31,7 @@ test(S s, typename S::value_type c, S expected)
assert(s == expected);
}
-int main()
+int main(int, char**)
{
{
typedef std::string S;
@@ -56,4 +56,6 @@ int main()
s.push_back(vl);
s.push_back(vl);
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
index 59d0199a2bf..c4062489291 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp
@@ -26,7 +26,7 @@ test(S s, typename S::size_type n, typename S::value_type c, S expected)
assert(s == expected);
}
-int main()
+int main(int, char**)
{
{
typedef std::string S;
@@ -60,4 +60,6 @@ int main()
test(S("12345678901234567890"), 10, 'a', S("12345678901234567890aaaaaaaaaa"));
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/string.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/string.pass.cpp
index c0c625f2e22..5e551d7a2b1 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/string.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/string.pass.cpp
@@ -26,7 +26,7 @@ test(S s, S str, S expected)
assert(s == expected);
}
-int main()
+int main(int, char**)
{
{
typedef std::string S;
@@ -85,4 +85,6 @@ int main()
assert(s == "a");
}
#endif
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
index 21ddd9bb225..37985d00115 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp
@@ -71,7 +71,7 @@ test_npos(S s, S str, typename S::size_type pos, S expected)
#endif
}
-int main()
+int main(int, char**)
{
{
typedef std::string S;
@@ -133,4 +133,6 @@ int main()
test_npos(S(), S("12345"), 5, S(""));
test_npos(S(), S("12345"), 6, S("not happening"));
}
+
+ return 0;
}
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/string_view.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/string_view.pass.cpp
index 301fc77b704..d0fb1cc3315 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/string_view.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/string_view.pass.cpp
@@ -27,7 +27,7 @@ test(S s, SV sv, S expected)
assert(s == expected);
}
-int main()
+int main(int, char**)
{
{
typedef std::string S;
@@ -79,4 +79,6 @@ int main()
S("1234567890123456789012345678901234567890"));
}
#endif
+
+ return 0;
}
OpenPOWER on IntegriCloud