From cae6588fdcd40169213aede5ea57167aebf222cb Mon Sep 17 00:00:00 2001
From: Nikita Popov <npopov@redhat.com>
Date: Tue, 8 Nov 2022 16:47:55 +0100
Subject: [PATCH 1/2] Update to LLVM 15.0.4

---
 .gitignore  | 2 ++
 libcxx.spec | 7 +++++--
 sources     | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index dda4116..2d4af0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,3 +93,5 @@
 /libcxx-14.0.5.src.tar.xz
 /libcxx-15.0.0.src.tar.xz
 /libcxx-15.0.0.src.tar.xz.sig
+/libcxx-15.0.4.src.tar.xz
+/libcxx-15.0.4.src.tar.xz.sig
diff --git a/libcxx.spec b/libcxx.spec
index ce940cb..8dc21ea 100644
--- a/libcxx.spec
+++ b/libcxx.spec
@@ -3,13 +3,13 @@
 %global toolchain clang
 %global bootstrap 0
 
-%global libcxx_version 15.0.0
+%global libcxx_version 15.0.4
 #global rc_ver 3
 %global libcxx_srcdir libcxx-%{libcxx_version}%{?rc_ver:rc%{rc_ver}}.src
 
 Name:		libcxx
 Version:	%{libcxx_version}%{?rc_ver:~rc%{rc_ver}}
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	C++ standard library targeting C++11
 License:	MIT or NCSA
 URL:		http://libcxx.llvm.org/
@@ -160,6 +160,9 @@ install -m 0644 src/include/*.h %{buildroot}%{_includedir}/libcxx-internal/
 
 
 %changelog
+* Tue Nov 08 2022 Nikita Popov <npopov@redhat.com> - 15.0.4-1
+- Update to LLVM 15.0.4
+
 * Tue Sep 13 2022 Nikita Popov <npopov@redhat.com> - 15.0.0-2
 - Link libc++.a against libc++abi.a
 
diff --git a/sources b/sources
index a56f5b0..ff73f3e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libcxx-15.0.0.src.tar.xz) = bfc8dcde5f89d3890e32579b2f894075b49bd8e50633b7bb2469864ddf26afb42ff65201e476451eeeaf5f15235891e8031979d78e3b30a3d641bfc85adbbaad
-SHA512 (libcxx-15.0.0.src.tar.xz.sig) = d038afbcd143fcfdea4033e37771aa659b95519e74bc0cd55537085a9ce68d2b5f471db2ad2567766ada7bf82d3014c36f55461e2847efa48a688334eaf2b11a
+SHA512 (libcxx-15.0.4.src.tar.xz) = 4d03a945e1625d4c7293c57e5432a782deb47d701895874fa6d518c835b1f84fdf3c00076155e17e825d0c72f6faccbc1c9394183fe9ffd70fce8e1cdcb85e3a
+SHA512 (libcxx-15.0.4.src.tar.xz.sig) = 23d99a7b92e83224a6a808fad474152d3007663cb9b96bad2cb66ac153064cd949a8998dd37f0469c3a9180efd1a0f00d5827cdb2e0508fea9db0b88e20730a1

From d548d83311c0c68f55fd41441f31b047af3f810b Mon Sep 17 00:00:00 2001
From: Jesus Checa Hidalgo <jchecahi@redhat.com>
Date: Fri, 23 Sep 2022 16:40:23 +0200
Subject: [PATCH 2/2] Port tests to tmt.

Removed old STI version of integration testsuite, pull the test
maintained in llvm repo over tmt instead.
---
 .fmf/version                            |  1 +
 tests/build-gating.fmf                  | 24 ++++++++++++++++
 tests/integration-test-suite/runtest.sh | 38 -------------------------
 tests/tests.yml                         | 25 ----------------
 4 files changed, 25 insertions(+), 63 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 tests/build-gating.fmf
 delete mode 100755 tests/integration-test-suite/runtest.sh
 delete mode 100644 tests/tests.yml

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf
new file mode 100644
index 0000000..f00b0b5
--- /dev/null
+++ b/tests/build-gating.fmf
@@ -0,0 +1,24 @@
+#
+# Build/PR gating tests for libcxx
+#
+
+summary: libcxx tests for build/PR gating
+adjust:
+  - because: "Plan to be ran when either executed locally, or executed by CI system to gate a build or PR."
+    when: >-
+      trigger is defined
+      and trigger != commit
+      and trigger != build
+    enabled: false
+
+discover:
+    - name: upstream-llvm-integration-testsuite
+      how: fmf
+      url: https://src.fedoraproject.org/tests/llvm.git
+      ref: main
+      test: integration-test-suite
+execute:
+    how: tmt
+provision:
+  hardware:
+    memory: ">= 4 GiB"
diff --git a/tests/integration-test-suite/runtest.sh b/tests/integration-test-suite/runtest.sh
deleted file mode 100755
index 1af4e4a..0000000
--- a/tests/integration-test-suite/runtest.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-usage() {
-    echo "usage `basename $0` [OPTIONS]"
-    echo "  --threads NUM       The number of threads to use for running tests."
-}
-
-thread_args=""
-repo_url=https://github.com/opencollab/llvm-toolchain-integration-test-suite
-
-while [ $# -gt 0 ]; do
-    case $1 in
-        --threads)
-            shift
-            threads="$1"
-            ;;
-        * )
-            echo "unknown option: $1"
-            echo ""
-            usage
-            exit 1
-            ;;
-    esac
-    shift
-done
-
-if [ -n "$threads" ]; then
-  thread_args="-j$threads"
-fi
-
-set -xe
-
-cd $(mktemp -d -p /var/tmp)
-git clone $repo_url
-cd llvm-toolchain-integration-test-suite
-mkdir _build && cd _build
-cmake .. -GNinja
-ninja $thread_args check
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 654240d..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-      - classic
-    required_packages:
-      # the requirements below are for the integration suite
-      - cmake
-      - llvm-devel
-      - clang
-      - clang-analyzer
-      - clang-tools-extra
-      - compiler-rt
-      - ninja-build
-      - libcxx-devel
-      - libomp-devel
-      - python-lit
-      - lld
-      - lldb
-      - git
-      - make
-      - libstdc++-static
-      - clang-devel
-    tests:
-      - integration-test-suite