From 8e1d8d6581e41abf1ae5c7f5324f5f14c712d20c Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Tue, 7 Apr 2020 09:28:56 +0000 Subject: [PATCH] Update testing to pass gating tests - Backport bab5908df544680ada0a3cf431f55aeccfbdb321 (test portability) - Fix indentation in tests/tests.yml - Remove testing of update utility tools --- ...908df544680ada0a3cf431f55aeccfbdb321.patch | 23 +++++++++++++++++++ llvm.spec | 9 +++++++- tests/tests.yml | 4 ++-- 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 bab5908df544680ada0a3cf431f55aeccfbdb321.patch diff --git a/bab5908df544680ada0a3cf431f55aeccfbdb321.patch b/bab5908df544680ada0a3cf431f55aeccfbdb321.patch new file mode 100644 index 0000000..2a93e6a --- /dev/null +++ b/bab5908df544680ada0a3cf431f55aeccfbdb321.patch @@ -0,0 +1,23 @@ +From bab5908df544680ada0a3cf431f55aeccfbdb321 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille +Date: Mon, 13 Apr 2020 13:44:15 +0200 +Subject: [PATCH] Normalize working directory when running llvm-mc in test + +Otherwise, depending on the lit location used to run the test, llvm-mc adds an +include_directories entry in the dwarf output, which breaks tests in some setup. + +Differential Revision: https://reviews.llvm.org/D77876 +--- + llvm/test/MC/MachO/gen-dwarf.s | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/llvm/test/MC/MachO/gen-dwarf.s b/llvm/test/MC/MachO/gen-dwarf.s +index 0813856d625f..6d39d278e818 100644 +--- a/llvm/test/MC/MachO/gen-dwarf.s ++++ b/llvm/test/MC/MachO/gen-dwarf.s +@@ -1,4 +1,4 @@ +-// RUN: llvm-mc -g -triple i386-apple-darwin10 %s -filetype=obj -o %t ++// RUN: mkdir -p %t0 && cd %t0 && llvm-mc -g -triple i386-apple-darwin10 %s -filetype=obj -o %t + // RUN: llvm-dwarfdump -all %t | FileCheck %s + + .globl _bar diff --git a/llvm.spec b/llvm.spec index 2083cca..4431778 100644 --- a/llvm.spec +++ b/llvm.spec @@ -11,7 +11,7 @@ %global llvm_libdir %{_libdir}/%{name} %global build_llvm_libdir %{buildroot}%{llvm_libdir} #%%global rc_ver 6 -%global baserelease 1 +%global baserelease 2 %global llvm_srcdir llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src %global maj_ver 10 %global min_ver 0 @@ -62,6 +62,7 @@ Patch0: 0001-CMake-Split-static-library-exports-into-their-own-ex.patch %if %{without compat_build} Patch1: 0001-CMake-Split-test-binary-exports-into-their-own-expor.patch %endif +Patch2: bab5908df544680ada0a3cf431f55aeccfbdb321.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -275,6 +276,8 @@ do install -m 0755 ./_build/bin/$f %{buildroot}%{_bindir} done +# Remove testing of update utility tools +rm -rf test/tools/UpdateTestChecks %multilib_fix_c_header --file %{_includedir}/llvm/Config/llvm-config.h @@ -490,6 +493,10 @@ fi %endif %changelog +* Tue Apr 07 2020 sguelton@redhat.com - 10.0.0-2 +- Do not package UpdateTestChecks tests in llvm-tests +- Apply upstream patch bab5908df to pass gating tests + * Wed Mar 25 2020 sguelton@redhat.com - 10.0.0-1 - 10.0.0 final diff --git a/tests/tests.yml b/tests/tests.yml index e17357f..12089c0 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -21,8 +21,8 @@ # is less than 100MB to ensure it was successfully stripped. # https://bugzilla.redhat.com/show_bug.cgi?id=1793250 - libllvm-size: - dir: ./ - run: test `stat -L -c %s /usr/lib64/libLLVM.so` -lt 100000000 + dir: ./ + run: test `stat -L -c %s /usr/lib64/libLLVM.so` -lt 100000000 # This test ensures that the spec file still builds correctly with # %global compat_build 1 # FIXME: This fails, because the CI system has a hard-coded timeout of 4