[libcxx-commits] [PATCH] D157045: [libc] Add support for runtimes build in libcxx-lit

[Will Hawkins via Phabricator via libcxx-commits]

hawkinsw created this revision.
hawkinsw added a reviewer: ldionne.
Herald added a subscriber: arichardson.
Herald added a project: All.
hawkinsw requested review of this revision.
Herald added a project: libc++.
Herald added a subscriber: libcxx-commits.
Herald added a reviewer: libc++.

Add a [-r|--runtimes] flag to change cxx-test-depends to
runtimes-test-depends when testing a build of libcxx from runtimes.

Signed-off-by: Will Hawkins <hawkinsw at obs.cr>


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D157045

Files:
  libcxx/utils/libcxx-lit


Index: libcxx/utils/libcxx-lit
===================================================================
--- libcxx/utils/libcxx-lit
+++ libcxx/utils/libcxx-lit
@@ -6,10 +6,11 @@
 function usage() {
 cat <<EOF
 Usage:
-${PROGNAME} [-h|--help] <build-directory> [lit options...] tests...
+${PROGNAME} [-h|--help] [-r|--runtimes] <build-directory> [lit options...] tests...
 
 Shortcut to build the libc++ testing dependencies and run the libc++ tests with Lit.
 
+[-r|--runtimes]    Configure tests to run against a runtimes build of libcxx.
 <build-directory>  The path to the build directory to use for building the library.
 [lit options...]   Optional options to pass to 'llvm-lit'.
 tests...           Paths of the tests to run. Those paths are relative to '<monorepo-root>'.
@@ -21,12 +22,16 @@
 EOF
 }
 
-for arg in $@; do
-    if [[ "${arg}" == "-h" || "${arg}" == "--help" ]]; then
-        usage
-        exit 0
-    fi
-done
+type="cxx"
+if [[ "${1}" == "-h" || "${1}" == "--help" ]]; then
+    usage
+    exit 0
+fi
+
+if [[ "${1}" == "-r" || "${1}" == "--runtimes" ]]; then
+    type="runtimes"
+		shift
+fi
 
 if [[ $# -lt 1 ]]; then
     usage
@@ -36,5 +41,9 @@
 build_dir="${1}"
 shift
 
-cmake --build "${build_dir}" --target cxx-test-depends
+if [[ "${type}" == "runtimes" ]]; then
+        echo "N.B.: In a runtimes build, lit needs a prefix to work correctly;"
+        echo "      See libcxx/docs/Testinglibcxx.rst for more information."
+fi
+cmake --build "${build_dir}" --target ${type}-test-depends
 "${build_dir}/bin/llvm-lit" ${@}


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D157045.547025.patch
Type: text/x-patch
Size: 1550 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20230803/92a024e8/attachment-0001.bin>