[libcxx-commits] [libcxx] 3a183a4 - [libc++] Fix two tests that were failing in freestanding mode

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2021-11-24T16:40:26-05:00
New Revision: 3a183a49f26df2f94f985ba0790d2d89cdcdad15

URL: https://github.com/llvm/llvm-project/commit/3a183a49f26df2f94f985ba0790d2d89cdcdad15
DIFF: https://github.com/llvm/llvm-project/commit/3a183a49f26df2f94f985ba0790d2d89cdcdad15.diff

LOG: [libc++] Fix two tests that were failing in freestanding mode

We were defining `main()` but never returning from it.

Added: 
    libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.deprecated.verify.cpp

Modified: 
    libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp

Removed: 
    libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.deprecated.fail.cpp


################################################################################
diff  --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp
index 42f215f9faa7d..20cfd52d6901d 100644
--- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp
+++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp
@@ -151,4 +151,6 @@ int main(int, char**)
     }
     assert(A::count == 0);
 #endif
+
+    return 0;
 }

diff  --git a/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.deprecated.fail.cpp b/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.deprecated.verify.cpp
similarity index 92%
rename from libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.deprecated.fail.cpp
rename to libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.deprecated.verify.cpp
index aece06674cf01..ddbddb8e05765 100644
--- a/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.deprecated.fail.cpp
+++ b/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.deprecated.verify.cpp
@@ -15,8 +15,6 @@
 
 #include <type_traits>
 
-#include "test_macros.h"
-
-int main(int, char**) {
+void f() {
   [[maybe_unused]] std::result_of<int (*())()> a; // expected-warning {{'result_of<int (*())()>' is deprecated}}
 }