[runtimes] Rename newformat to just format, now that the old format has been removed

diff --git a/libcxx/test/libcxx/selftest/newformat/additional_compile_flags/substitutes-in-compile-flags.sh.cpp b/libcxx/test/libcxx/selftest/additional_compile_flags/substitutes-in-compile-flags.sh.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/additional_compile_flags/substitutes-in-compile-flags.sh.cpp
rename to libcxx/test/libcxx/selftest/additional_compile_flags/substitutes-in-compile-flags.sh.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/additional_compile_flags/substitutes-in-run.sh.cpp b/libcxx/test/libcxx/selftest/additional_compile_flags/substitutes-in-run.sh.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/additional_compile_flags/substitutes-in-run.sh.cpp
rename to libcxx/test/libcxx/selftest/additional_compile_flags/substitutes-in-run.sh.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/compile.fail.cpp/compile-error.compile.fail.cpp b/libcxx/test/libcxx/selftest/compile.fail.cpp/compile-error.compile.fail.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/compile.fail.cpp/compile-error.compile.fail.cpp
rename to libcxx/test/libcxx/selftest/compile.fail.cpp/compile-error.compile.fail.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/compile.fail.cpp/compile-success.compile.fail.cpp b/libcxx/test/libcxx/selftest/compile.fail.cpp/compile-success.compile.fail.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/compile.fail.cpp/compile-success.compile.fail.cpp
rename to libcxx/test/libcxx/selftest/compile.fail.cpp/compile-success.compile.fail.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/compile.pass.cpp/compile-error.compile.pass.cpp b/libcxx/test/libcxx/selftest/compile.pass.cpp/compile-error.compile.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/compile.pass.cpp/compile-error.compile.pass.cpp
rename to libcxx/test/libcxx/selftest/compile.pass.cpp/compile-error.compile.pass.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/compile.pass.cpp/compile-success.compile.pass.cpp b/libcxx/test/libcxx/selftest/compile.pass.cpp/compile-success.compile.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/compile.pass.cpp/compile-success.compile.pass.cpp
rename to libcxx/test/libcxx/selftest/compile.pass.cpp/compile-success.compile.pass.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/compile.pass.cpp/link-error.compile.pass.cpp b/libcxx/test/libcxx/selftest/compile.pass.cpp/link-error.compile.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/compile.pass.cpp/link-error.compile.pass.cpp
rename to libcxx/test/libcxx/selftest/compile.pass.cpp/link-error.compile.pass.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/compile.pass.cpp/run-error.compile.pass.cpp b/libcxx/test/libcxx/selftest/compile.pass.cpp/run-error.compile.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/compile.pass.cpp/run-error.compile.pass.cpp
rename to libcxx/test/libcxx/selftest/compile.pass.cpp/run-error.compile.pass.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/convenience_substitutions/build_run.sh.cpp b/libcxx/test/libcxx/selftest/convenience_substitutions/build_run.sh.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/convenience_substitutions/build_run.sh.cpp
rename to libcxx/test/libcxx/selftest/convenience_substitutions/build_run.sh.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-failure.fail.cpp b/libcxx/test/libcxx/selftest/fail.cpp/compile-failure.fail.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-failure.fail.cpp
rename to libcxx/test/libcxx/selftest/fail.cpp/compile-failure.fail.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-success.fail.cpp b/libcxx/test/libcxx/selftest/fail.cpp/compile-success.fail.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-success.fail.cpp
rename to libcxx/test/libcxx/selftest/fail.cpp/compile-success.fail.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/fail.cpp/lit.local.cfg b/libcxx/test/libcxx/selftest/fail.cpp/lit.local.cfg
similarity index 65%
rename from libcxx/test/libcxx/selftest/newformat/fail.cpp/lit.local.cfg
rename to libcxx/test/libcxx/selftest/fail.cpp/lit.local.cfg
index 2cd7606..b8ef6cb 100644 (file)
--- a/libcxx/test/libcxx/selftest/newformat/fail.cpp/lit.local.cfg
+++ b/libcxx/test/libcxx/selftest/fail.cpp/lit.local.cfg
@@ -1,6 +1,6 @@
-import libcxx.test.newformat
+import libcxx.test.format
 
 # The tests in this directory need to know whether Clang-verify is supported
 # to work properly.
-if libcxx.test.newformat._supportsVerify(config):
+if libcxx.test.format._supportsVerify(config):
     config.available_features.add('verify-support')

diff --git a/libcxx/test/libcxx/selftest/newformat/fail.cpp/no-diagnostics-unmarked.fail.cpp b/libcxx/test/libcxx/selftest/fail.cpp/no-diagnostics-unmarked.fail.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/fail.cpp/no-diagnostics-unmarked.fail.cpp
rename to libcxx/test/libcxx/selftest/fail.cpp/no-diagnostics-unmarked.fail.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/fail.cpp/no-diagnostics.fail.cpp b/libcxx/test/libcxx/selftest/fail.cpp/no-diagnostics.fail.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/fail.cpp/no-diagnostics.fail.cpp
rename to libcxx/test/libcxx/selftest/fail.cpp/no-diagnostics.fail.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/fail.cpp/right-diagnostic.fail.cpp b/libcxx/test/libcxx/selftest/fail.cpp/right-diagnostic.fail.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/fail.cpp/right-diagnostic.fail.cpp
rename to libcxx/test/libcxx/selftest/fail.cpp/right-diagnostic.fail.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/fail.cpp/wrong-diagnostic.fail.cpp b/libcxx/test/libcxx/selftest/fail.cpp/wrong-diagnostic.fail.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/fail.cpp/wrong-diagnostic.fail.cpp
rename to libcxx/test/libcxx/selftest/fail.cpp/wrong-diagnostic.fail.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/file_dependencies/a.txt b/libcxx/test/libcxx/selftest/file_dependencies/a.txt
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/file_dependencies/a.txt
rename to libcxx/test/libcxx/selftest/file_dependencies/a.txt

diff --git a/libcxx/test/libcxx/selftest/newformat/file_dependencies/absolute-and-relative-paths.sh.cpp b/libcxx/test/libcxx/selftest/file_dependencies/absolute-and-relative-paths.sh.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/file_dependencies/absolute-and-relative-paths.sh.cpp
rename to libcxx/test/libcxx/selftest/file_dependencies/absolute-and-relative-paths.sh.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/file_dependencies/dir/b.txt b/libcxx/test/libcxx/selftest/file_dependencies/dir/b.txt
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/file_dependencies/dir/b.txt
rename to libcxx/test/libcxx/selftest/file_dependencies/dir/b.txt

diff --git a/libcxx/test/libcxx/selftest/newformat/file_dependencies/substitute-in-dependencies.sh.cpp b/libcxx/test/libcxx/selftest/file_dependencies/substitute-in-dependencies.sh.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/file_dependencies/substitute-in-dependencies.sh.cpp
rename to libcxx/test/libcxx/selftest/file_dependencies/substitute-in-dependencies.sh.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/link.fail.cpp/compile-error.link.fail.cpp b/libcxx/test/libcxx/selftest/link.fail.cpp/compile-error.link.fail.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/link.fail.cpp/compile-error.link.fail.cpp
rename to libcxx/test/libcxx/selftest/link.fail.cpp/compile-error.link.fail.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/link.fail.cpp/link-error.link.fail.cpp b/libcxx/test/libcxx/selftest/link.fail.cpp/link-error.link.fail.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/link.fail.cpp/link-error.link.fail.cpp
rename to libcxx/test/libcxx/selftest/link.fail.cpp/link-error.link.fail.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/link.fail.cpp/link-success.link.fail.cpp b/libcxx/test/libcxx/selftest/link.fail.cpp/link-success.link.fail.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/link.fail.cpp/link-success.link.fail.cpp
rename to libcxx/test/libcxx/selftest/link.fail.cpp/link-success.link.fail.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/link.pass.cpp/compile-error.link.pass.cpp b/libcxx/test/libcxx/selftest/link.pass.cpp/compile-error.link.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/link.pass.cpp/compile-error.link.pass.cpp
rename to libcxx/test/libcxx/selftest/link.pass.cpp/compile-error.link.pass.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/link.pass.cpp/link-error.link.pass.cpp b/libcxx/test/libcxx/selftest/link.pass.cpp/link-error.link.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/link.pass.cpp/link-error.link.pass.cpp
rename to libcxx/test/libcxx/selftest/link.pass.cpp/link-error.link.pass.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/link.pass.cpp/link-success.link.pass.cpp b/libcxx/test/libcxx/selftest/link.pass.cpp/link-success.link.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/link.pass.cpp/link-success.link.pass.cpp
rename to libcxx/test/libcxx/selftest/link.pass.cpp/link-success.link.pass.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/link.pass.cpp/run-error.link.pass.cpp b/libcxx/test/libcxx/selftest/link.pass.cpp/run-error.link.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/link.pass.cpp/run-error.link.pass.cpp
rename to libcxx/test/libcxx/selftest/link.pass.cpp/run-error.link.pass.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/lit.local.cfg b/libcxx/test/libcxx/selftest/newformat/lit.local.cfg
deleted file mode 100644 (file)
index 0f75e02..0000000
--- a/libcxx/test/libcxx/selftest/newformat/lit.local.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-import os
-import site
-site.addsitedir(os.path.join(os.path.dirname(__file__), '..', '..', '..', '..', 'utils'))
-import libcxx.test.newformat
-
-if not isinstance(config.test_format, libcxx.test.newformat.CxxStandardLibraryTest):
-    config.unsupported = True

diff --git a/libcxx/test/libcxx/selftest/newformat/pass.cpp/compile-error.pass.cpp b/libcxx/test/libcxx/selftest/pass.cpp/compile-error.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/pass.cpp/compile-error.pass.cpp
rename to libcxx/test/libcxx/selftest/pass.cpp/compile-error.pass.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/pass.cpp/link-error.pass.cpp b/libcxx/test/libcxx/selftest/pass.cpp/link-error.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/pass.cpp/link-error.pass.cpp
rename to libcxx/test/libcxx/selftest/pass.cpp/link-error.pass.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/pass.cpp/run-error.pass.cpp b/libcxx/test/libcxx/selftest/pass.cpp/run-error.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/pass.cpp/run-error.pass.cpp
rename to libcxx/test/libcxx/selftest/pass.cpp/run-error.pass.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/pass.cpp/run-success.pass.cpp b/libcxx/test/libcxx/selftest/pass.cpp/run-success.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/pass.cpp/run-success.pass.cpp
rename to libcxx/test/libcxx/selftest/pass.cpp/run-success.pass.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/pass.cpp/werror.pass.cpp b/libcxx/test/libcxx/selftest/pass.cpp/werror.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/pass.cpp/werror.pass.cpp
rename to libcxx/test/libcxx/selftest/pass.cpp/werror.pass.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/pass.mm/compile-error.pass.mm b/libcxx/test/libcxx/selftest/pass.mm/compile-error.pass.mm
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/pass.mm/compile-error.pass.mm
rename to libcxx/test/libcxx/selftest/pass.mm/compile-error.pass.mm

diff --git a/libcxx/test/libcxx/selftest/newformat/pass.mm/link-error.pass.mm b/libcxx/test/libcxx/selftest/pass.mm/link-error.pass.mm
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/pass.mm/link-error.pass.mm
rename to libcxx/test/libcxx/selftest/pass.mm/link-error.pass.mm

diff --git a/libcxx/test/libcxx/selftest/newformat/pass.mm/no-arc.pass.mm b/libcxx/test/libcxx/selftest/pass.mm/no-arc.pass.mm
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/pass.mm/no-arc.pass.mm
rename to libcxx/test/libcxx/selftest/pass.mm/no-arc.pass.mm

diff --git a/libcxx/test/libcxx/selftest/newformat/pass.mm/run-error.pass.mm b/libcxx/test/libcxx/selftest/pass.mm/run-error.pass.mm
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/pass.mm/run-error.pass.mm
rename to libcxx/test/libcxx/selftest/pass.mm/run-error.pass.mm

diff --git a/libcxx/test/libcxx/selftest/newformat/pass.mm/run-success.pass.mm b/libcxx/test/libcxx/selftest/pass.mm/run-success.pass.mm
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/pass.mm/run-success.pass.mm
rename to libcxx/test/libcxx/selftest/pass.mm/run-success.pass.mm

diff --git a/libcxx/test/libcxx/selftest/newformat/pass.mm/use-objective-cxx.pass.mm b/libcxx/test/libcxx/selftest/pass.mm/use-objective-cxx.pass.mm
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/pass.mm/use-objective-cxx.pass.mm
rename to libcxx/test/libcxx/selftest/pass.mm/use-objective-cxx.pass.mm

diff --git a/libcxx/test/libcxx/selftest/newformat/remote-substitutions.sh.cpp b/libcxx/test/libcxx/selftest/remote-substitutions.sh.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/remote-substitutions.sh.cpp
rename to libcxx/test/libcxx/selftest/remote-substitutions.sh.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/run.fail.cpp/compile-error.run.fail.cpp b/libcxx/test/libcxx/selftest/run.fail.cpp/compile-error.run.fail.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/run.fail.cpp/compile-error.run.fail.cpp
rename to libcxx/test/libcxx/selftest/run.fail.cpp/compile-error.run.fail.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/run.fail.cpp/link-error.run.fail.cpp b/libcxx/test/libcxx/selftest/run.fail.cpp/link-error.run.fail.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/run.fail.cpp/link-error.run.fail.cpp
rename to libcxx/test/libcxx/selftest/run.fail.cpp/link-error.run.fail.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/run.fail.cpp/run-error.run.fail.cpp b/libcxx/test/libcxx/selftest/run.fail.cpp/run-error.run.fail.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/run.fail.cpp/run-error.run.fail.cpp
rename to libcxx/test/libcxx/selftest/run.fail.cpp/run-error.run.fail.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/run.fail.cpp/run-success.run.fail.cpp b/libcxx/test/libcxx/selftest/run.fail.cpp/run-success.run.fail.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/run.fail.cpp/run-success.run.fail.cpp
rename to libcxx/test/libcxx/selftest/run.fail.cpp/run-success.run.fail.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/sh.cpp/empty.sh.cpp b/libcxx/test/libcxx/selftest/sh.cpp/empty.sh.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/sh.cpp/empty.sh.cpp
rename to libcxx/test/libcxx/selftest/sh.cpp/empty.sh.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/sh.cpp/run-error.sh.cpp b/libcxx/test/libcxx/selftest/sh.cpp/run-error.sh.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/sh.cpp/run-error.sh.cpp
rename to libcxx/test/libcxx/selftest/sh.cpp/run-error.sh.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/sh.cpp/run-success.sh.cpp b/libcxx/test/libcxx/selftest/sh.cpp/run-success.sh.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/sh.cpp/run-success.sh.cpp
rename to libcxx/test/libcxx/selftest/sh.cpp/run-success.sh.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/sh.cpp/substitutions.sh.cpp b/libcxx/test/libcxx/selftest/sh.cpp/substitutions.sh.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/sh.cpp/substitutions.sh.cpp
rename to libcxx/test/libcxx/selftest/sh.cpp/substitutions.sh.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/sh.cpp/werror.sh.cpp b/libcxx/test/libcxx/selftest/sh.cpp/werror.sh.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/sh.cpp/werror.sh.cpp
rename to libcxx/test/libcxx/selftest/sh.cpp/werror.sh.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/shell-escape-pipes.sh.cpp b/libcxx/test/libcxx/selftest/shell-escape-pipes.sh.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/shell-escape-pipes.sh.cpp
rename to libcxx/test/libcxx/selftest/shell-escape-pipes.sh.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/shell-escape.sh.cpp b/libcxx/test/libcxx/selftest/shell-escape.sh.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/shell-escape.sh.cpp
rename to libcxx/test/libcxx/selftest/shell-escape.sh.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/tmpdir-exists.sh.cpp b/libcxx/test/libcxx/selftest/tmpdir-exists.sh.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/tmpdir-exists.sh.cpp
rename to libcxx/test/libcxx/selftest/tmpdir-exists.sh.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/verify.cpp/no-diagnostics-unmarked.verify.cpp b/libcxx/test/libcxx/selftest/verify.cpp/no-diagnostics-unmarked.verify.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/verify.cpp/no-diagnostics-unmarked.verify.cpp
rename to libcxx/test/libcxx/selftest/verify.cpp/no-diagnostics-unmarked.verify.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/verify.cpp/no-diagnostics.verify.cpp b/libcxx/test/libcxx/selftest/verify.cpp/no-diagnostics.verify.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/verify.cpp/no-diagnostics.verify.cpp
rename to libcxx/test/libcxx/selftest/verify.cpp/no-diagnostics.verify.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/verify.cpp/no-werror.verify.cpp b/libcxx/test/libcxx/selftest/verify.cpp/no-werror.verify.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/verify.cpp/no-werror.verify.cpp
rename to libcxx/test/libcxx/selftest/verify.cpp/no-werror.verify.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/verify.cpp/right-diagnostic.verify.cpp b/libcxx/test/libcxx/selftest/verify.cpp/right-diagnostic.verify.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/verify.cpp/right-diagnostic.verify.cpp
rename to libcxx/test/libcxx/selftest/verify.cpp/right-diagnostic.verify.cpp

diff --git a/libcxx/test/libcxx/selftest/newformat/verify.cpp/wrong-diagnostic.verify.cpp b/libcxx/test/libcxx/selftest/verify.cpp/wrong-diagnostic.verify.cpp
similarity index 100%
rename from libcxx/test/libcxx/selftest/newformat/verify.cpp/wrong-diagnostic.verify.cpp
rename to libcxx/test/libcxx/selftest/verify.cpp/wrong-diagnostic.verify.cpp

diff --git a/libcxx/test/lit.site.cfg.in b/libcxx/test/lit.site.cfg.in
index 4d3c493..939776f 100644 (file)
--- a/libcxx/test/lit.site.cfg.in
+++ b/libcxx/test/lit.site.cfg.in
@@ -60,8 +60,8 @@ config.recursiveExpansionLimit = 10
 # Infer the test_exec_root from the libcxx_object root.
 config.test_exec_root = os.path.join(config.libcxx_obj_root, 'test')
 
-import libcxx.test.newformat
-config.test_format = libcxx.test.newformat.CxxStandardLibraryTest()
+import libcxx.test.format
+config.test_format = libcxx.test.format.CxxStandardLibraryTest()
 
 lit_config.note('Using configuration variant: {}'.format(config.configuration_variant))
 import libcxx.test.config

diff --git a/libcxx/utils/libcxx/test/dsl.py b/libcxx/utils/libcxx/test/dsl.py
index 9f5152d..e0e09e6 100644 (file)
--- a/libcxx/utils/libcxx/test/dsl.py
+++ b/libcxx/utils/libcxx/test/dsl.py
@@ -6,7 +6,7 @@
 #
 #===----------------------------------------------------------------------===##
 
-import libcxx.test.newformat
+import libcxx.test.format
 import lit
 import lit.util
 import os
@@ -29,7 +29,7 @@ def _executeScriptInternal(test, commands):
 
   TODO: This really should be easier to access from Lit itself
   """
-  parsedCommands = libcxx.test.newformat.parseScript(test, preamble=commands)
+  parsedCommands = libcxx.test.format.parseScript(test, preamble=commands)
 
   litConfig = lit.LitConfig.LitConfig(
     progname='lit',
@@ -42,7 +42,7 @@ def _executeScriptInternal(test, commands):
     debug=False,
     isWindows=platform.system() == 'Windows',
     params={})
-  _, tmpBase = libcxx.test.newformat._getTempPaths(test)
+  _, tmpBase = libcxx.test.format._getTempPaths(test)
   execDir = os.path.dirname(test.getExecPath())
   for d in (execDir, os.path.dirname(tmpBase)):
     if not os.path.exists(d):

diff --git a/libcxx/utils/libcxx/test/newformat.py b/libcxx/utils/libcxx/test/format.py
similarity index 100%
rename from libcxx/utils/libcxx/test/newformat.py
rename to libcxx/utils/libcxx/test/format.py

diff --git a/libcxxabi/test/lit.site.cfg.in b/libcxxabi/test/lit.site.cfg.in
index 3d1c546..75fde7e 100644 (file)
--- a/libcxxabi/test/lit.site.cfg.in
+++ b/libcxxabi/test/lit.site.cfg.in
@@ -54,8 +54,8 @@ config.recursiveExpansionLimit = 10
 # Infer the test_exec_root from the build directory.
 config.test_exec_root = os.path.join(config.libcxxabi_obj_root, 'test')
 
-import libcxx.test.newformat
-config.test_format = libcxx.test.newformat.CxxStandardLibraryTest()
+import libcxx.test.format
+config.test_format = libcxx.test.format.CxxStandardLibraryTest()
 
 lit_config.note('Using configuration variant: libcxxabi')
 import libcxxabi.test.config

diff --git a/libunwind/test/lit.site.cfg.in b/libunwind/test/lit.site.cfg.in
index 64d945d..d0f0e08 100644 (file)
--- a/libunwind/test/lit.site.cfg.in
+++ b/libunwind/test/lit.site.cfg.in
@@ -48,8 +48,8 @@ config.recursiveExpansionLimit = 10
 # Infer the test_exec_root from the build directory.
 config.test_exec_root = os.path.join(config.libunwind_obj_root, 'test')
 
-import libcxx.test.newformat
-config.test_format = libcxx.test.newformat.CxxStandardLibraryTest()
+import libcxx.test.format
+config.test_format = libcxx.test.format.CxxStandardLibraryTest()
 
 lit_config.note('Using configuration variant: libunwind')
 import libunwind.test.config