From d786a89a64e4155c1a1706f2ab7d1c4fc05ee257 Mon Sep 17 00:00:00 2001 From: Konrad Kleine Date: Wed, 22 May 2024 09:53:23 +0200 Subject: [PATCH] Format all files with 'pre-commit run -a' --- .copr/snapshot-info.sh | 2 +- .pre-commit-config.yaml | 1 + Makefile | 3 +-- check.spec.inc | 18 +++++++++--------- globals.spec.inc | 2 +- llvm.rpmlintrc | 16 ++++++++-------- tests/README.md | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.copr/snapshot-info.sh b/.copr/snapshot-info.sh index 704efb9..70cfb4f 100755 --- a/.copr/snapshot-info.sh +++ b/.copr/snapshot-info.sh @@ -5,7 +5,7 @@ set -e # This is important for systems that have a different local but want to produce -# a valid changelog date. +# a valid changelog date. LANG=en_EN function loginfo() { diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8afd326..61ca349 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,6 +19,7 @@ repos: - id: check-yaml args: - "--allow-multiple-documents" + - "--unsafe" # See https://tmt.readthedocs.io/en/latest/guide.html#checking-data-validity - repo: https://github.com/teemtee/tmt.git diff --git a/Makefile b/Makefile index 9fff882..ee3cd59 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ local-list-check: setup --define "_disable_source_fetch 0" \ -- $(SPEC) -bl -.PHONY: local-prep +.PHONY: local-prep local-prep: setup fedpkg --release $(FEDORA_RELEASE) -v \ prep \ @@ -94,4 +94,3 @@ local-tmt-vm: -c fedora-llvm-team/llvm-snapshots-big-merge-20240124 \ test \ report - diff --git a/check.spec.inc b/check.spec.inc index 598b335..7d5b935 100644 --- a/check.spec.inc +++ b/check.spec.inc @@ -22,17 +22,17 @@ export LIT_XFAIL="" # in your test paths. declare -a filter_out_tests -#region LLVM xfail tests +#region LLVM xfail tests # Xfail testing of update utility tools -# LLVM :: +# LLVM :: export LIT_XFAIL="$LIT_XFAIL;tools/UpdateTestChecks" #endregion #region CLANG xfail tests -# Clang :: +# Clang :: export LIT_XFAIL="$LIT_XFAIL;clang/test/CodeGen/profile-filter.c" #endregion @@ -45,7 +45,7 @@ export LIT_XFAIL="$LIT_XFAIL;clang/test/CodeGen/profile-filter.c" # Change Dir: '/builddir/build/BUILD/openmp-17.0.6.src/redhat-linux-build' # Run Build Command(s): /usr/bin/ninja-build -v -j 6 check-openmp # [1/1] cd /builddir/build/BUILD/openmp-17.0.6.src/redhat-linux-build && /usr/bin/cmake -E echo check-openmp\ does\ nothing,\ dependencies\ not\ found. -# +# # We're marking the tests that are failing with the follwing error as expected to fail (XFAIL): # # gdb.error: No symbol "ompd_sizeof____kmp_gtid" in current context @@ -79,7 +79,7 @@ filter_out_tests+=("libomp :: ompt/teams/distribute_dispatch.c") # The following tests seem pass on ppc64le and x86_64 and aarch64 only: %ifnarch ppc64le x86_64 s390x aarch64 -# Passes on ppc64le: +# Passes on ppc64le: # libomptarget :: powerpc64le-ibm-linux-gnu :: mapping/target_derefence_array_pointrs.cpp # libomptarget :: powerpc64le-ibm-linux-gnu-LTO :: mapping/target_derefence_array_pointrs.cpp # Passes on x86_64: @@ -88,7 +88,7 @@ filter_out_tests+=("libomp :: ompt/teams/distribute_dispatch.c") # Passes on s390x: # libomptarget :: s390x-ibm-linux-gnu :: mapping/target_derefence_array_pointrs.cpp # libomptarget :: s390x-ibm-linux-gnu-LTO :: mapping/target_derefence_array_pointrs.cpp -export LIT_XFAIL="$LIT_XFAIL;mapping/target_derefence_array_pointrs.cpp" +export LIT_XFAIL="$LIT_XFAIL;mapping/target_derefence_array_pointrs.cpp" %endif %ifnarch x86_64 @@ -97,8 +97,8 @@ export LIT_XFAIL="$LIT_XFAIL;mapping/target_derefence_array_pointrs.cpp" # libomptarget :: x86_64-pc-linux-gnu :: api/ompx_3d.cpp # libomptarget :: x86_64-pc-linux-gnu-LTO :: api/ompx_3d.c # libomptarget :: x86_64-pc-linux-gnu-LTO :: api/ompx_3d.cpp -# libomptarget :: aarch64-unknown-linux-gnu :: -export LIT_XFAIL="$LIT_XFAIL;api/ompx_3d.c" +# libomptarget :: aarch64-unknown-linux-gnu :: +export LIT_XFAIL="$LIT_XFAIL;api/ompx_3d.c" export LIT_XFAIL="$LIT_XFAIL;api/ompx_3d.cpp" %endif @@ -194,7 +194,7 @@ export LIT_XFAIL="$LIT_XFAIL;worksharing/for/omp_collapse_one_int.c" filter_out_tests=$(printf "|%s" "${filter_out_tests[@]}") # Remove the initial pipe symbol filter_out_tests=${filter_out_tests:1} -# Properly escape path dots (".") for use in regular expression +# Properly escape path dots (".") for use in regular expression filter_out_tests=$(echo $filter_out_tests | sed 's/\./\\./') # Add enclosing parenthesis export LIT_FILTER_OUT="($filter_out_tests)" diff --git a/globals.spec.inc b/globals.spec.inc index d3dacfe..349172e 100644 --- a/globals.spec.inc +++ b/globals.spec.inc @@ -98,7 +98,7 @@ %ifarch ppc64le # Too many threads on ppc64 systems causes OOM errors. -# TODO(kkleine): Is this really needed when building together with llvm? +# TODO(kkleine): Is this really needed when building together with llvm? %global _smp_mflags -j8 %endif diff --git a/llvm.rpmlintrc b/llvm.rpmlintrc index 5f98c56..de8f68f 100644 --- a/llvm.rpmlintrc +++ b/llvm.rpmlintrc @@ -23,10 +23,10 @@ addFilter("llvm-test.x86_64: W: no-documentation") # This is a devel package addFilter("W: devel-file-in-non-devel-package") - + # These symlinks are dangling on x64_64 addFilter("compiler-rt.x86_64: W: dangling-relative-symlink /usr/lib64/clang/[0-9]+.[0-9]+.[0-9]+/") - + addFilter("E: hardcoded-library-path in ../../lib/clang/") @@ -37,13 +37,13 @@ addFilter("E: hardcoded-library-path in ../../lib/clang/") ## CLANG ############################################################ clang needs libstdc++-devel installed in order to compile c++ programs. - + addFilter("E: devel-dependency libstdc\+\+-devel") - + addFilter("E: explicit-lib-dependency libstdc\+\+-devel") - + # clang installs libear to /usr/lib on all arches, so we have to use - + # a hard-coded /usr/lib path in order to move it to the python3 sitelib. - -addFilter("E: hardcoded-library-path in %{_prefix}/lib/{libear") \ No newline at end of file + +addFilter("E: hardcoded-library-path in %{_prefix}/lib/{libear") diff --git a/tests/README.md b/tests/README.md index 5aeb3d6..2afa54e 100644 --- a/tests/README.md +++ b/tests/README.md @@ -3,4 +3,4 @@ The tests for LLVM are in a separate repo: https://src.fedoraproject.org/tests/llvm This directory should contain only fmf plans (such as build-gating.fmf) which import the tests from the tests repo. This can be done using the "url" parameter of the -plan's "discover" step. Reference: https://tmt.readthedocs.io/en/stable/spec/plans.html#fmf \ No newline at end of file +plan's "discover" step. Reference: https://tmt.readthedocs.io/en/stable/spec/plans.html#fmf