https://github.com/Endilll updated
https://github.com/llvm/llvm-project/pull/94208
>From 5c757153a3f462d40663add6a9ae7caf42272913 Mon Sep 17 00:00:00 2001
From: Vlad Serebrennikov <serebrennikov.vladis...@gmail.com>
Date: Mon, 3 Jun 2024 13:33:36 +0300
Subject: [PATCH 1/9] Enable LLDB tests in pre-submit CI
---
.ci/generate-buildkite-pipeline-premerge | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/.ci/generate-buildkite-pipeline-premerge
b/.ci/generate-buildkite-pipeline-premerge
index 033ab804b165e..a9972f235ff46 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -153,7 +153,6 @@ function exclude-linux() {
for project in ${projects}; do
case ${project} in
cross-project-tests) ;; # tests failing
- lldb) ;; # tests failing
openmp) ;; #
https://github.com/google/llvm-premerge-checks/issues/410
*)
echo "${project}"
@@ -170,7 +169,6 @@ function exclude-windows() {
compiler-rt) ;; # tests taking too long
openmp) ;; # TODO: having trouble with the Perl installation
libc) ;; # no Windows support
- lldb) ;; # tests failing
bolt) ;; # tests are not supported yet
*)
echo "${project}"
@@ -213,7 +211,7 @@ function check-targets() {
echo "check-unwind"
;;
lldb)
- echo "check-all" # TODO: check-lldb may not include all the LLDB tests?
+ echo "check-lldb" # TODO: check-lldb may not include all the LLDB tests?
;;
pstl)
echo "check-all"
>From 49e21f6b92623e280cfc49ac631b7481eb7a1229 Mon Sep 17 00:00:00 2001
From: Vlad Serebrennikov <serebrennikov.vladis...@gmail.com>
Date: Mon, 3 Jun 2024 13:34:18 +0300
Subject: [PATCH 2/9] Trigger Clang CI
---
clang/examples/PrintFunctionNames/PrintFunctionNames.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/examples/PrintFunctionNames/PrintFunctionNames.cpp
b/clang/examples/PrintFunctionNames/PrintFunctionNames.cpp
index 6509a6440e12d..b2b785b87c25c 100644
--- a/clang/examples/PrintFunctionNames/PrintFunctionNames.cpp
+++ b/clang/examples/PrintFunctionNames/PrintFunctionNames.cpp
@@ -72,7 +72,7 @@ class PrintFunctionsConsumer : public ASTConsumer {
*sema.LateParsedTemplateMap.find(FD)->second;
sema.LateTemplateParser(sema.OpaqueParser, LPT);
llvm::errs() << "late-parsed-decl: \"" << FD->getNameAsString() <<
"\"\n";
- }
+ }
}
};
>From c2d7679f76e971e5532c1cd91d99e7866f738960 Mon Sep 17 00:00:00 2001
From: Vlad Serebrennikov <serebrennikov.vladis...@gmail.com>
Date: Mon, 3 Jun 2024 15:48:05 +0300
Subject: [PATCH 3/9] Add `pip install pexpect`
---
.ci/monolithic-linux.sh | 2 ++
.ci/monolithic-windows.sh | 2 ++
2 files changed, 4 insertions(+)
diff --git a/.ci/monolithic-linux.sh b/.ci/monolithic-linux.sh
index 38d7128f241b6..95ac4218ef8fa 100755
--- a/.ci/monolithic-linux.sh
+++ b/.ci/monolithic-linux.sh
@@ -39,6 +39,8 @@ targets="${2}"
echo "--- cmake"
pip install -q -r "${MONOREPO_ROOT}"/mlir/python/requirements.txt
+# Needed for several LLDB tests
+pip install pexpect
cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
-D LLVM_ENABLE_PROJECTS="${projects}" \
-G Ninja \
diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh
index 91e719c52d436..e8807e3ba69bf 100755
--- a/.ci/monolithic-windows.sh
+++ b/.ci/monolithic-windows.sh
@@ -38,6 +38,8 @@ targets="${2}"
echo "--- cmake"
pip install -q -r "${MONOREPO_ROOT}"/mlir/python/requirements.txt
+# Needed for several LLDB tests
+pip install pexpect
# The CMAKE_*_LINKER_FLAGS to disable the manifest come from research
# on fixing a build reliability issue on the build server, please
>From 496d2998a722a7bb57fc9a5a38f9ee5e52440c1d Mon Sep 17 00:00:00 2001
From: Vlad Serebrennikov <serebrennikov.vladis...@gmail.com>
Date: Mon, 3 Jun 2024 21:20:01 +0300
Subject: [PATCH 4/9] Switch to `requirements.txt` provided by LLDB now
---
.ci/monolithic-linux.sh | 3 +--
.ci/monolithic-windows.sh | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/.ci/monolithic-linux.sh b/.ci/monolithic-linux.sh
index 95ac4218ef8fa..b78dc59432b65 100755
--- a/.ci/monolithic-linux.sh
+++ b/.ci/monolithic-linux.sh
@@ -39,8 +39,7 @@ targets="${2}"
echo "--- cmake"
pip install -q -r "${MONOREPO_ROOT}"/mlir/python/requirements.txt
-# Needed for several LLDB tests
-pip install pexpect
+pip install -q -r "${MONOREPO_ROOT}"/lldb/test/requirements.txt
cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
-D LLVM_ENABLE_PROJECTS="${projects}" \
-G Ninja \
diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh
index e8807e3ba69bf..af78447295012 100755
--- a/.ci/monolithic-windows.sh
+++ b/.ci/monolithic-windows.sh
@@ -38,8 +38,7 @@ targets="${2}"
echo "--- cmake"
pip install -q -r "${MONOREPO_ROOT}"/mlir/python/requirements.txt
-# Needed for several LLDB tests
-pip install pexpect
+pip install -q -r "${MONOREPO_ROOT}"/lldb/test/requirements.txt
# The CMAKE_*_LINKER_FLAGS to disable the manifest come from research
# on fixing a build reliability issue on the build server, please
>From 441df5c99d3b3ecf70846deec11cc184ff2ef54c Mon Sep 17 00:00:00 2001
From: Vlad Serebrennikov <serebrennikov.vladis...@gmail.com>
Date: Tue, 4 Jun 2024 02:26:05 +0300
Subject: [PATCH 5/9] Disable LLDB tests on Windows back
---
.ci/generate-buildkite-pipeline-premerge | 1 +
.ci/monolithic-windows.sh | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci/generate-buildkite-pipeline-premerge
b/.ci/generate-buildkite-pipeline-premerge
index a9972f235ff46..4f1bf3d0b0f29 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -169,6 +169,7 @@ function exclude-windows() {
compiler-rt) ;; # tests taking too long
openmp) ;; # TODO: having trouble with the Perl installation
libc) ;; # no Windows support
+ lldb) ;; # custom environment requirements
(https://github.com/llvm/llvm-project/pull/94208#issuecomment-2146256857)
bolt) ;; # tests are not supported yet
*)
echo "${project}"
diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh
index af78447295012..91e719c52d436 100755
--- a/.ci/monolithic-windows.sh
+++ b/.ci/monolithic-windows.sh
@@ -38,7 +38,6 @@ targets="${2}"
echo "--- cmake"
pip install -q -r "${MONOREPO_ROOT}"/mlir/python/requirements.txt
-pip install -q -r "${MONOREPO_ROOT}"/lldb/test/requirements.txt
# The CMAKE_*_LINKER_FLAGS to disable the manifest come from research
# on fixing a build reliability issue on the build server, please
>From 8df0d40ff37166caef18f48bae737b1bd2fa2ba8 Mon Sep 17 00:00:00 2001
From: Vlad Serebrennikov <serebrennikov.vladis...@gmail.com>
Date: Tue, 4 Jun 2024 02:26:59 +0300
Subject: [PATCH 6/9] Remove TODO about check target for LLDB
---
.ci/generate-buildkite-pipeline-premerge | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci/generate-buildkite-pipeline-premerge
b/.ci/generate-buildkite-pipeline-premerge
index 4f1bf3d0b0f29..fd603de611e56 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -212,7 +212,7 @@ function check-targets() {
echo "check-unwind"
;;
lldb)
- echo "check-lldb" # TODO: check-lldb may not include all the LLDB tests?
+ echo "check-lldb"
;;
pstl)
echo "check-all"
>From 629ae424ccb89e452d18a0df54291993192c0e2f Mon Sep 17 00:00:00 2001
From: Vlad Serebrennikov <serebrennikov.vladis...@gmail.com>
Date: Tue, 4 Jun 2024 19:12:18 +0300
Subject: [PATCH 7/9] Disable building and testing LLDB on Clang changes
---
.ci/generate-buildkite-pipeline-premerge | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci/generate-buildkite-pipeline-premerge
b/.ci/generate-buildkite-pipeline-premerge
index fd603de611e56..ee41167988545 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -74,7 +74,7 @@ function compute-projects-to-test() {
fi
;;
clang)
- for p in clang-tools-extra compiler-rt lldb cross-project-tests; do
+ for p in clang-tools-extra compiler-rt cross-project-tests; do
echo $p
done
;;
>From dc11541fa4b001fe55a443159bb50e1c2e5a4de1 Mon Sep 17 00:00:00 2001
From: Vlad Serebrennikov <serebrennikov.vladis...@gmail.com>
Date: Fri, 7 Jun 2024 13:03:28 +0300
Subject: [PATCH 8/9] Build and test LLDB on Clang changes
---
.ci/generate-buildkite-pipeline-premerge | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci/generate-buildkite-pipeline-premerge
b/.ci/generate-buildkite-pipeline-premerge
index ee41167988545..55bc6e88337bc 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -74,7 +74,7 @@ function compute-projects-to-test() {
fi
;;
clang)
- for p in clang-tools-extra compiler-rt cross-project-tests; do
+ for p in clang-tools-extra compiler-rt cross-project-tests lldb; do
echo $p
done
;;
>From 25281d02373fc8df8241d601adffafb1ebea8795 Mon Sep 17 00:00:00 2001
From: Vlad Serebrennikov <serebrennikov.vladis...@gmail.com>
Date: Fri, 7 Jun 2024 13:04:46 +0300
Subject: [PATCH 9/9] Move LLDB entry to its original poisition
---
.ci/generate-buildkite-pipeline-premerge | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci/generate-buildkite-pipeline-premerge
b/.ci/generate-buildkite-pipeline-premerge
index 55bc6e88337bc..fd603de611e56 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -74,7 +74,7 @@ function compute-projects-to-test() {
fi
;;
clang)
- for p in clang-tools-extra compiler-rt cross-project-tests lldb; do
+ for p in clang-tools-extra compiler-rt lldb cross-project-tests; do
echo $p
done
;;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
