[test] Cleanup nullopt_t tests

* Update specification text from N4387

* Delete not_brace_initializable.fail.cpp: it's redundant with nullopt_t.fail.cpp

* is_empty<T> implies is_class<T>

* is_literal is deprecated; directly verify that we can create a nullopt_t in a constexpr context

Differential Revision: D37024

llvm-svn: 312256

1 files changed, 3 insertions, 5 deletions

diff --git a/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.fail.cpp b/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.fail.cpp
index 84f1e78ca2a..c97bebe29c3 100644
--- a/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.fail.cpp
+++ b/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.fail.cpp
@@ -11,15 +11,13 @@
 // <optional>
 
 // struct nullopt_t{see below};
-// constexpr nullopt_t nullopt(unspecified);
+// inline constexpr nullopt_t nullopt(unspecified);
 
 // [optional.nullopt]/2:
-//   Type nullopt_t shall not have a default constructor or an initializer-list constructor.
-//   It shall not be an aggregate and shall be a literal type.
-//   Constant nullopt shall be initialized with an argument of literal type.
+//   Type nullopt_t shall not have a default constructor or an initializer-list
+//   constructor, and shall not be an aggregate.
 
 #include <optional>
-#include "test_macros.h"
 
 int main()
 {