From 189d6a8834e26332e3718cfeb1a27d8169ef7f50 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Wed, 22 Jun 2016 02:07:26 +0000 Subject: [PATCH] Move more _LIBCPP_VERSION tests to test/libcxx. llvm-svn: 273365 --- .../{std => libcxx}/atomics/version.pass.cpp | 0 .../assertions/version_cassert.pass.cpp | 20 +++++++++++++++++++ .../diagnostics/errno/version_cerrno.pass.cpp | 19 ++++++++++++++++++ .../std.exceptions/version.pass.cpp | 0 .../diagnostics/syserr/version.pass.cpp | 0 .../experimental/optional/version.pass.cpp | 0 .../utilities/meta/version.pass.cpp | 0 .../utilities/utility/version.pass.cpp | 0 .../strings/c.strings/version_cctype.pass.cpp | 0 .../c.strings/version_cstring.pass.cpp | 0 .../strings/c.strings/version_cuchar.pass.cpp | 0 .../strings/c.strings/version_cwchar.pass.cpp | 0 .../c.strings/version_cwctype.pass.cpp | 0 .../{std => libcxx}/strings/version.pass.cpp | 0 .../thread/thread.condition/version.pass.cpp | 0 .../thread/thread.mutex/version.pass.cpp | 0 .../thread/thread.threads/version.pass.cpp | 0 .../diagnostics/assertions/cassert.pass.cpp | 4 ---- .../std/diagnostics/errno/cerrno.pass.cpp | 4 ---- 19 files changed, 39 insertions(+), 8 deletions(-) rename libcxx/test/{std => libcxx}/atomics/version.pass.cpp (100%) create mode 100644 libcxx/test/libcxx/diagnostics/assertions/version_cassert.pass.cpp create mode 100644 libcxx/test/libcxx/diagnostics/errno/version_cerrno.pass.cpp rename libcxx/test/{std => libcxx}/diagnostics/std.exceptions/version.pass.cpp (100%) rename libcxx/test/{std => libcxx}/diagnostics/syserr/version.pass.cpp (100%) rename libcxx/test/{std => libcxx}/experimental/optional/version.pass.cpp (100%) rename libcxx/test/{std => libcxx}/experimental/utilities/meta/version.pass.cpp (100%) rename libcxx/test/{std => libcxx}/experimental/utilities/utility/version.pass.cpp (100%) rename libcxx/test/{std => libcxx}/strings/c.strings/version_cctype.pass.cpp (100%) rename libcxx/test/{std => libcxx}/strings/c.strings/version_cstring.pass.cpp (100%) rename libcxx/test/{std => libcxx}/strings/c.strings/version_cuchar.pass.cpp (100%) rename libcxx/test/{std => libcxx}/strings/c.strings/version_cwchar.pass.cpp (100%) rename libcxx/test/{std => libcxx}/strings/c.strings/version_cwctype.pass.cpp (100%) rename libcxx/test/{std => libcxx}/strings/version.pass.cpp (100%) rename libcxx/test/{std => libcxx}/thread/thread.condition/version.pass.cpp (100%) rename libcxx/test/{std => libcxx}/thread/thread.mutex/version.pass.cpp (100%) rename libcxx/test/{std => libcxx}/thread/thread.threads/version.pass.cpp (100%) diff --git a/libcxx/test/std/atomics/version.pass.cpp b/libcxx/test/libcxx/atomics/version.pass.cpp similarity index 100% rename from libcxx/test/std/atomics/version.pass.cpp rename to libcxx/test/libcxx/atomics/version.pass.cpp diff --git a/libcxx/test/libcxx/diagnostics/assertions/version_cassert.pass.cpp b/libcxx/test/libcxx/diagnostics/assertions/version_cassert.pass.cpp new file mode 100644 index 000000000000..f123a05256ec --- /dev/null +++ b/libcxx/test/libcxx/diagnostics/assertions/version_cassert.pass.cpp @@ -0,0 +1,20 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// test + +#include + +#ifndef _LIBCPP_VERSION +#error _LIBCPP_VERSION not defined +#endif + +int main() +{ +} diff --git a/libcxx/test/libcxx/diagnostics/errno/version_cerrno.pass.cpp b/libcxx/test/libcxx/diagnostics/errno/version_cerrno.pass.cpp new file mode 100644 index 000000000000..7cd2be8efa92 --- /dev/null +++ b/libcxx/test/libcxx/diagnostics/errno/version_cerrno.pass.cpp @@ -0,0 +1,19 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// test + +#include + +#ifndef _LIBCPP_VERSION +#error _LIBCPP_VERSION not defined +#endif + +int main() {} diff --git a/libcxx/test/std/diagnostics/std.exceptions/version.pass.cpp b/libcxx/test/libcxx/diagnostics/std.exceptions/version.pass.cpp similarity index 100% rename from libcxx/test/std/diagnostics/std.exceptions/version.pass.cpp rename to libcxx/test/libcxx/diagnostics/std.exceptions/version.pass.cpp diff --git a/libcxx/test/std/diagnostics/syserr/version.pass.cpp b/libcxx/test/libcxx/diagnostics/syserr/version.pass.cpp similarity index 100% rename from libcxx/test/std/diagnostics/syserr/version.pass.cpp rename to libcxx/test/libcxx/diagnostics/syserr/version.pass.cpp diff --git a/libcxx/test/std/experimental/optional/version.pass.cpp b/libcxx/test/libcxx/experimental/optional/version.pass.cpp similarity index 100% rename from libcxx/test/std/experimental/optional/version.pass.cpp rename to libcxx/test/libcxx/experimental/optional/version.pass.cpp diff --git a/libcxx/test/std/experimental/utilities/meta/version.pass.cpp b/libcxx/test/libcxx/experimental/utilities/meta/version.pass.cpp similarity index 100% rename from libcxx/test/std/experimental/utilities/meta/version.pass.cpp rename to libcxx/test/libcxx/experimental/utilities/meta/version.pass.cpp diff --git a/libcxx/test/std/experimental/utilities/utility/version.pass.cpp b/libcxx/test/libcxx/experimental/utilities/utility/version.pass.cpp similarity index 100% rename from libcxx/test/std/experimental/utilities/utility/version.pass.cpp rename to libcxx/test/libcxx/experimental/utilities/utility/version.pass.cpp diff --git a/libcxx/test/std/strings/c.strings/version_cctype.pass.cpp b/libcxx/test/libcxx/strings/c.strings/version_cctype.pass.cpp similarity index 100% rename from libcxx/test/std/strings/c.strings/version_cctype.pass.cpp rename to libcxx/test/libcxx/strings/c.strings/version_cctype.pass.cpp diff --git a/libcxx/test/std/strings/c.strings/version_cstring.pass.cpp b/libcxx/test/libcxx/strings/c.strings/version_cstring.pass.cpp similarity index 100% rename from libcxx/test/std/strings/c.strings/version_cstring.pass.cpp rename to libcxx/test/libcxx/strings/c.strings/version_cstring.pass.cpp diff --git a/libcxx/test/std/strings/c.strings/version_cuchar.pass.cpp b/libcxx/test/libcxx/strings/c.strings/version_cuchar.pass.cpp similarity index 100% rename from libcxx/test/std/strings/c.strings/version_cuchar.pass.cpp rename to libcxx/test/libcxx/strings/c.strings/version_cuchar.pass.cpp diff --git a/libcxx/test/std/strings/c.strings/version_cwchar.pass.cpp b/libcxx/test/libcxx/strings/c.strings/version_cwchar.pass.cpp similarity index 100% rename from libcxx/test/std/strings/c.strings/version_cwchar.pass.cpp rename to libcxx/test/libcxx/strings/c.strings/version_cwchar.pass.cpp diff --git a/libcxx/test/std/strings/c.strings/version_cwctype.pass.cpp b/libcxx/test/libcxx/strings/c.strings/version_cwctype.pass.cpp similarity index 100% rename from libcxx/test/std/strings/c.strings/version_cwctype.pass.cpp rename to libcxx/test/libcxx/strings/c.strings/version_cwctype.pass.cpp diff --git a/libcxx/test/std/strings/version.pass.cpp b/libcxx/test/libcxx/strings/version.pass.cpp similarity index 100% rename from libcxx/test/std/strings/version.pass.cpp rename to libcxx/test/libcxx/strings/version.pass.cpp diff --git a/libcxx/test/std/thread/thread.condition/version.pass.cpp b/libcxx/test/libcxx/thread/thread.condition/version.pass.cpp similarity index 100% rename from libcxx/test/std/thread/thread.condition/version.pass.cpp rename to libcxx/test/libcxx/thread/thread.condition/version.pass.cpp diff --git a/libcxx/test/std/thread/thread.mutex/version.pass.cpp b/libcxx/test/libcxx/thread/thread.mutex/version.pass.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/version.pass.cpp rename to libcxx/test/libcxx/thread/thread.mutex/version.pass.cpp diff --git a/libcxx/test/std/thread/thread.threads/version.pass.cpp b/libcxx/test/libcxx/thread/thread.threads/version.pass.cpp similarity index 100% rename from libcxx/test/std/thread/thread.threads/version.pass.cpp rename to libcxx/test/libcxx/thread/thread.threads/version.pass.cpp diff --git a/libcxx/test/std/diagnostics/assertions/cassert.pass.cpp b/libcxx/test/std/diagnostics/assertions/cassert.pass.cpp index bed7a394ee4a..3f886e7b91fd 100644 --- a/libcxx/test/std/diagnostics/assertions/cassert.pass.cpp +++ b/libcxx/test/std/diagnostics/assertions/cassert.pass.cpp @@ -15,10 +15,6 @@ #error assert not defined #endif -#ifndef _LIBCPP_VERSION -#error _LIBCPP_VERSION not defined -#endif - int main() { } diff --git a/libcxx/test/std/diagnostics/errno/cerrno.pass.cpp b/libcxx/test/std/diagnostics/errno/cerrno.pass.cpp index c6743fb79e7f..72c9371d16c4 100644 --- a/libcxx/test/std/diagnostics/errno/cerrno.pass.cpp +++ b/libcxx/test/std/diagnostics/errno/cerrno.pass.cpp @@ -12,10 +12,6 @@ #include -#ifndef _LIBCPP_VERSION -#error _LIBCPP_VERSION not defined -#endif - #ifndef E2BIG #error E2BIG not defined #endif