Test without some patches

This commit is contained in:
Konrad Kleine 2022-10-06 21:43:33 +02:00 committed by Timm Bäder
parent 132731e88c
commit e9164d278f
2 changed files with 0 additions and 105 deletions

View file

@ -1,29 +0,0 @@
From fca5cbc9c0ad26a7ac61cafe90b4af49dab5605d Mon Sep 17 00:00:00 2001
From: Konrad Kleine <kkleine@redhat.com>
Date: Tue, 27 Apr 2021 14:41:57 +0200
Subject: [PATCH] Make source-interleave-prefix test case compatible with
llvm-test
llvm-test runs test from a directory that's not the upstream one, and that leads
to some false positive. Workaround this by forcing the current working
directory.
---
llvm/test/tools/llvm-objdump/X86/source-interleave-prefix.test | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/llvm/test/tools/llvm-objdump/X86/source-interleave-prefix.test b/llvm/test/tools/llvm-objdump/X86/source-interleave-prefix.test
index 746add22f96e..8b28b877e372 100644
--- a/llvm/test/tools/llvm-objdump/X86/source-interleave-prefix.test
+++ b/llvm/test/tools/llvm-objdump/X86/source-interleave-prefix.test
@@ -11,7 +11,7 @@
; RUN: sed -e "s,SRC_COMPDIR,./Inputs,g" %p/Inputs/source-interleave.ll > %t-relative-path.ll
; RUN: llc -o %t-relative-path.o -filetype=obj -mtriple=x86_64-pc-linux %t-relative-path.ll
-; RUN: llvm-objdump --prefix myprefix --source %t-relative-path.o 2>&1 | \
+; RUN: mkdir -p %t0 && cd %t0 && llvm-objdump --prefix myprefix --source %t-relative-path.o 2>&1 | \
; RUN: FileCheck %s --check-prefix=CHECK-BROKEN-PREFIX -DFILE=%t-relative-path.o -DPREFIX=. -DCOMPDIR=/Inputs
; CHECK-BROKEN-PREFIX: warning: '[[FILE]]': failed to find source [[PREFIX]][[COMPDIR]]{{[/\\]}}source-interleave-x86_64.c
--
2.37.1

View file

@ -1,76 +0,0 @@
From 902523d6c3a0f6566699befa30bd1cc694de10b2 Mon Sep 17 00:00:00 2001
From: Konrad Kleine <kkleine@redhat.com>
Date: Wed, 16 Feb 2022 22:03:40 +0100
Subject: [PATCH] Revert "cmake: Don't install plugins used for examples or
tests"
This reverts commit d0a767608773cfa3d8644c27796b63ff40962806.
By reverting this we fix these errors:
CMake Error at /usr/lib64/cmake/llvm/AddLLVM.cmake:1821 (add_dependencies):
The dependency target "LLVMHello" of target "check-all" does not exist.
Call Stack (most recent call first):
CMakeLists.txt:578 (add_lit_target)
CMake Error at /usr/lib64/cmake/llvm/AddLLVM.cmake:1821 (add_dependencies):
The dependency target "LLVMHello" of target "check-clang-tools" does not
exist.
Call Stack (most recent call first):
/usr/lib64/cmake/llvm/AddLLVM.cmake:1842 (add_lit_target)
/builddir/build/BUILD/clang-tools-extra-15.0.0.src/test/CMakeLists.txt:110 (add_lit_testsuite)
CMake Error at /usr/lib64/cmake/llvm/AddLLVM.cmake:1821 (add_dependencies):
The dependency target "LLVMHello" of target "check-clang-extra-unit" does
not exist.
Call Stack (most recent call first):
/usr/lib64/cmake/llvm/AddLLVM.cmake:1877 (add_lit_target)
/builddir/build/BUILD/clang-tools-extra-15.0.0.src/test/CMakeLists.txt:118 (add_lit_testsuites)
---
llvm/lib/Transforms/Hello/CMakeLists.txt | 2 +-
llvm/tools/bugpoint-passes/CMakeLists.txt | 2 +-
llvm/unittests/Passes/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/llvm/lib/Transforms/Hello/CMakeLists.txt b/llvm/lib/Transforms/Hello/CMakeLists.txt
index c4f10247c1a6..d9cd33a4938e 100644
--- a/llvm/lib/Transforms/Hello/CMakeLists.txt
+++ b/llvm/lib/Transforms/Hello/CMakeLists.txt
@@ -10,7 +10,7 @@ if(WIN32 OR CYGWIN)
set(LLVM_LINK_COMPONENTS Core Support)
endif()
-add_llvm_library( LLVMHello MODULE BUILDTREE_ONLY
+add_llvm_library( LLVMHello MODULE
Hello.cpp
DEPENDS
diff --git a/llvm/tools/bugpoint-passes/CMakeLists.txt b/llvm/tools/bugpoint-passes/CMakeLists.txt
index eea3e239b808..56a7eacebf1a 100644
--- a/llvm/tools/bugpoint-passes/CMakeLists.txt
+++ b/llvm/tools/bugpoint-passes/CMakeLists.txt
@@ -14,7 +14,7 @@ if(WIN32 OR CYGWIN)
set(LLVM_LINK_COMPONENTS Core)
endif()
-add_llvm_library( BugpointPasses MODULE BUILDTREE_ONLY
+add_llvm_library( BugpointPasses MODULE
TestPasses.cpp
DEPENDS
diff --git a/llvm/unittests/Passes/CMakeLists.txt b/llvm/unittests/Passes/CMakeLists.txt
index a5683cd3741f..82553a3a6e56 100644
--- a/llvm/unittests/Passes/CMakeLists.txt
+++ b/llvm/unittests/Passes/CMakeLists.txt
@@ -26,7 +26,7 @@ if (NOT WIN32)
set(LLVM_LINK_COMPONENTS)
foreach(PLUGIN TestPlugin DoublerPlugin)
- add_llvm_library(${PLUGIN} MODULE BUILDTREE_ONLY ${PLUGIN}.cpp)
+ add_llvm_library(${PLUGIN} MODULE ${PLUGIN}.cpp)
# Put PLUGIN next to the unit test executable.
set_output_directory(${PLUGIN}
--
2.37.1