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/.gitignore b/.gitignore index a850372..dcf1bf6 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /trace-cmd-v3.1.4.tar.gz /trace-cmd-v3.1.6.tar.gz /trace-cmd-v3.2.tar.gz +/trace-cmd-v3.3.1.tar.gz diff --git a/0001-python313.patch b/0001-python313.patch deleted file mode 100644 index 42bf62a..0000000 --- a/0001-python313.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2ba15130fae66e19d4d75ab28ef448b0206235c4 Mon Sep 17 00:00:00 2001 -From: Yaakov Selkowitz -Date: Sun, 23 Jun 2024 13:04:28 -0400 -Subject: [PATCH] trace-cmd library: fix compatibility with Python 3.13 - -PyEval_CallObject was deprecated in Python 3.9 and removed from 3.13. - -Signed-off-by: Yaakov Selkowitz ---- - python/ctracecmd.i | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/python/ctracecmd.i b/python/ctracecmd.i -index 6d0179e3..8757cbe4 100644 ---- a/python/ctracecmd.i -+++ b/python/ctracecmd.i -@@ -214,7 +214,7 @@ static int python_callback(struct trace_seq *s, - SWIG_NewPointerObj(SWIG_as_voidptr(event), - SWIGTYPE_p_tep_event, 0)); - -- result = PyEval_CallObject(context, arglist); -+ result = PyObject_CallObject(context, arglist); - Py_XDECREF(arglist); - if (result && result != Py_None) { - if (!PyInt_Check(result)) { --- -2.45.2 - diff --git a/sources b/sources index b70e5d8..65e4f7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (trace-cmd-v3.2.tar.gz) = 6a8474e619b32ccf60217eba1ce472bdf6e77f6aff118b579f329b49eaf1b20c9a7802b539876be7c782f33dc78587cc510c7b4bf12af5707bfa2813e59ae442 +SHA512 (trace-cmd-v3.3.1.tar.gz) = a643efc2868d08871a7359dd0a17389685fb229f26328ee96f27a3dd94b5f3eb62009b945c14725eda1f09fa15367ffe2e2c3611d89860dcc031bbd6403cdee0 diff --git a/tests/README.md b/tests/README.md deleted file mode 100644 index f37b84e..0000000 --- a/tests/README.md +++ /dev/null @@ -1,44 +0,0 @@ -About - -Trace-cmd tests according to the CI wiki specifically the standard test interface in the [spec](https://fedoraproject.org/wiki/Changes/InvokingTests). - -The playbook includes Tier1 level test cases that have been tested in classic contexts and is passing reliably. - -The following steps are used to execute the tests using the standard test interface: - -Test environment - -Make sure you have installed packages from the spec - - `# dnf install ansible python2-dnf libselinux-python standard-test-roles ansible python2-dnf libselinux-python standard-test-roles` - -Run tests for Classic -~~~~ - # export TEST_SUBJECTS= - # sudo ansible-playbook --tags=classic tests.yml -~~~~ - -Snip of the example test run for Classic tests: - -> TASK [standard-test-beakerlib : Run beakerlib tests] ***************************************************************************************************************************************** -> -> changed: [localhost] => (item=sanity) -> -> TASK [standard-test-beakerlib : Make the master tests summary log artifact] ****************************************************************************************************************** -> -> changed: [localhost] => (item=sanity) -> -> TASK [standard-test-beakerlib : Check the results] ******************************************************************************************************************************************* -> -> changed: [localhost] -> -> TASK [standard-test-beakerlib : include_role] ************************************************************************************************************************************************ -> -> TASK [str-common : Pull out the logs from test environment to test runner] ******************************************************************************************************************* -> -> changed: [localhost] -> -> PLAY RECAP *********************************************************************************************************************************************************************************** -> -> localhost : ok=27 changed=16 unreachable=0 failed=0 -> diff --git a/tests/plan.fmf b/tests/plan.fmf new file mode 100644 index 0000000..f8b2604 --- /dev/null +++ b/tests/plan.fmf @@ -0,0 +1,8 @@ +prepare: + how: install + package: + - trace-cmd +discover: + how: fmf +execute: + how: tmt diff --git a/tests/sanity/Makefile b/tests/sanity/Makefile deleted file mode 100644 index 7af6df1..0000000 --- a/tests/sanity/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Description: Basic sanity test for trace-cmd -# Author: Ziqian SUN (Zamir) -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2018 Red Hat, Inc. All rights reserved. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export PACKAGE_NAME=trace-cmd -export TEST=/kernel/general/ftrace/tools/trace-cmd/upstream -export TESTVERSION=0.1 - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: - chmod a+x runtest.sh - -clean: - rm -fr *~ tests-*.rpm - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Ziqian SUN (Zamir) " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Basic sanity test for trace-cmd" >> $(METADATA) - @echo "TestTime: 30m" >> $(METADATA) - @echo "RunFor: trace-cmd" >> $(METADATA) - @echo "Requires: @development" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv3" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/sanity/sanity.fmf b/tests/sanity/sanity.fmf new file mode 100644 index 0000000..8733518 --- /dev/null +++ b/tests/sanity/sanity.fmf @@ -0,0 +1,3 @@ +test: bash ./runtest.sh +framework: beakerlib +duration: 15m diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index e244be9..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-beakerlib - tests: - - sanity - required_packages: - - kernel - - trace-cmd - diff --git a/trace-cmd.spec b/trace-cmd.spec index f738999..3d7202f 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -2,7 +2,7 @@ #%%global git_commit trace-cmd-v2.6.2 #%%global git_commit 57371aaa2f469d0ba15fd85276deca7bfdd7ce36 -%global srcversion 3.2 +%global srcversion 3.3.1 Name: trace-cmd Version: %{srcversion} @@ -21,7 +21,6 @@ Source0: https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/t Source1: trace-cmd.conf Source2: trace-cmd.service Source3: 98-trace-cmd.rules -Patch0: 0001-python313.patch BuildRequires: make BuildRequires: gcc @@ -53,7 +52,7 @@ BuildRequires: python3-devel Python plugin support for trace-cmd %prep -%autosetup -n %{name}-v%{srcversion} -p1 +%autosetup -n %{name}-v%{srcversion} cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE3} . @@ -103,6 +102,19 @@ rm -rf %{buildroot}/%{_mandir}/man3/* %{_libdir}/%{name}/python/ %changelog +* Fri Aug 15 2025 Zamir SUN - 3.3.1-4 +- Bump to build and run new gating +- Reolves: rhbz#2383087 + +* Fri Jul 25 2025 Fedora Release Engineering - 3.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Oct 17 2024 Zamir SUN - 3.3.1-1 +- Update to 3.3 + * Sat Jul 20 2024 Fedora Release Engineering - 3.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild