From 8944a27aaf1125cec4c48d5c343f99f156964074 Mon Sep 17 00:00:00 2001 From: Sergey Kolosov Date: Tue, 4 Apr 2023 23:07:18 +0200 Subject: [PATCH] CI Tests: removes Regression/bz2141685-glibc-Restore-IPC-64-support-in-sysvipc-ctl and Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to tests --- .../Makefile | 64 ----------------- .../PURPOSE | 8 --- .../m1.stp | 4 -- .../m1_p9.stp | 4 -- .../main.fmf | 22 ------ .../runtest.sh | 70 ------------------- .../t.c | 12 ---- .../trigger.sh | 16 ----- .../Makefile | 64 ----------------- .../PURPOSE | 5 -- .../main.fmf | 20 ------ .../runtest.sh | 51 -------------- 12 files changed, 340 deletions(-) delete mode 100644 tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/Makefile delete mode 100644 tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/PURPOSE delete mode 100644 tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/m1.stp delete mode 100644 tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/m1_p9.stp delete mode 100644 tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/main.fmf delete mode 100755 tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/runtest.sh delete mode 100644 tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/t.c delete mode 100755 tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/trigger.sh delete mode 100644 tests/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to/Makefile delete mode 100644 tests/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to/PURPOSE delete mode 100644 tests/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to/main.fmf delete mode 100755 tests/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to/runtest.sh diff --git a/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/Makefile b/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/Makefile deleted file mode 100644 index 8ff19d0..0000000 --- a/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /tools/glibc/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements -# Description: Test for BZ#1746933 (glibc Backport malloc tcache enhancements ) -# Author: Sergey Kolosov -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2020 Red Hat, Inc. -# -# 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 2 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 http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/tools/glibc/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE m1.stp m1_p9.stp t.c trigger.sh - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Sergey Kolosov " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test for BZ#1746933 (glibc Backport malloc tcache enhancements)" >> $(METADATA) - @echo "Type: Regression" >> $(METADATA) - @echo "TestTime: 10m" >> $(METADATA) - @echo "RunFor: glibc" >> $(METADATA) - @echo "Requires: gcc glibc glibc-devel systemtap" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2+" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Bug: 1746933" >> $(METADATA) - @echo "Releases: -RHEL4 -RHEL5 -RHEL6 -RHEL7" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/PURPOSE b/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/PURPOSE deleted file mode 100644 index 262ea54..0000000 --- a/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/PURPOSE +++ /dev/null @@ -1,8 +0,0 @@ -PURPOSE of /tools/glibc/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements -Description: Test for BZ#1746933 (glibc Backport malloc tcache enhancements ) -Author: Sergey Kolosov -Bug summary: glibc: Backport malloc tcache enhancements (swbz#24531) -Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1746933 - -TODO -Use correct path to libc in case of power9/power8 diff --git a/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/m1.stp b/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/m1.stp deleted file mode 100644 index 5ffe276..0000000 --- a/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/m1.stp +++ /dev/null @@ -1,4 +0,0 @@ -probe process("/lib64/libc.so.6").mark("memory_tunable_tcache_count") -{ - printf("PID=%d New tcache_count:%ld, old tcache_count:%ld\n",pid(), $arg1, $arg2) -} diff --git a/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/m1_p9.stp b/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/m1_p9.stp deleted file mode 100644 index 3c63874..0000000 --- a/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/m1_p9.stp +++ /dev/null @@ -1,4 +0,0 @@ -probe process("/lib64/glibc-hwcaps/power9/libc.so.6").mark("memory_tunable_tcache_count") -{ - printf("PID=%d New tcache_count:%ld, old tcache_count:%ld\n",pid(), $arg1, $arg2) -} diff --git a/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/main.fmf b/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/main.fmf deleted file mode 100644 index 8ae1a03..0000000 --- a/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/main.fmf +++ /dev/null @@ -1,22 +0,0 @@ -summary: Test for BZ#1746933 (glibc Backport malloc tcache enhancements) -description: | - Bug summary: glibc: Backport malloc tcache enhancements (swbz#24531) - Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1746933 - - TODO - Use correct path to libc in case of power9/power8 -link: - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1746933 -contact: Sergey Kolosov -component: - - glibc -test: ./runtest.sh -framework: beakerlib -require: - - gcc - - glibc - - glibc-devel - - systemtap -duration: 10m -extra-summary: /tools/glibc/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements -extra-task: /tools/glibc/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements diff --git a/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/runtest.sh b/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/runtest.sh deleted file mode 100755 index 5b08f7d..0000000 --- a/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/runtest.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /tools/glibc/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements -# Description: Test for BZ#1746933 (glibc Backport malloc tcache enhancements ) -# Author: Sergey Kolosov -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2020 Red Hat, Inc. -# -# 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 2 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 http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="glibc" -TESTPROG="t" -TRIG="trigger.sh" -SSCRIPT="m1.stp" -SSCRIPTP9="m1_p9.stp" -SREPORT="report.txt" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - PACKNVR=$(rpm -q ${PACKAGE}.`arch`) - rlRun "TESTTMPDIR=$(mktemp -d)" - rlRun "cp ${TESTPROG}.c $TRIG $SSCRIPT $SSCRIPTP9 $TESTTMPDIR" - rlRun "pushd $TESTTMPDIR" - rlPhaseEnd - - rlPhaseStartTest - rlRun -c "gcc ${TESTPROG}.c -o $TESTPROG" - rlAssertExists "$TESTPROG" - if [ `arch` = "ppc64le" ] && rlIsRHEL 8; then - rlRun -l "stap -v $SSCRIPTP9 -c ./${TRIG} > $SREPORT" - else - rlRun -l "stap -v $SSCRIPT -c ./${TRIG} > $SREPORT" - fi - rlAssertGrep "tcache_count:11111" $SREPORT - rlAssertGrep "tcache_count:65" $SREPORT - rlAssertGrep "tcache_count:0" $SREPORT - rlAssertGrep "tcache_count:65535" $SREPORT - rlAssertNotGrep "tcache_count:65536" $SREPORT - rlAssertNotGrep "tcache_count:5555555" $SREPORT - rlAssertNotGrep "tcache_count:-20" $SREPORT - rlFileSubmit $SREPORT - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TESTTMPDIR" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/t.c b/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/t.c deleted file mode 100644 index 6b89fc0..0000000 --- a/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/t.c +++ /dev/null @@ -1,12 +0,0 @@ -#include -#include - -int main() { - void *m; - printf("Malloc test\n"); - if(!malloc(100)) { - perror("malloc"); - return 1; - } - return 0; -} diff --git a/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/trigger.sh b/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/trigger.sh deleted file mode 100755 index f8c41c9..0000000 --- a/tests/Regression/bz1746933-glibc-Backport-malloc-tcache-enhancements/trigger.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -export "GLIBC_TUNABLES=glibc.malloc.tcache_count=11111" -./t -export "GLIBC_TUNABLES=glibc.malloc.tcache_count=65" -./t -export "GLIBC_TUNABLES=glibc.malloc.tcache_count=0" -./t -export "GLIBC_TUNABLES=glibc.malloc.tcache_count=65535" -./t -export "GLIBC_TUNABLES=glibc.malloc.tcache_count=65536" -./t -export "GLIBC_TUNABLES=glibc.malloc.tcache_count=-20" -./t -export "GLIBC_TUNABLES=glibc.malloc.tcache_count=5555555" -./t - diff --git a/tests/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to/Makefile b/tests/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to/Makefile deleted file mode 100644 index 5cd3985..0000000 --- a/tests/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /tools/glibc/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to -# Description: Test for BZ#1915330 (glibc Implement find-debuginfo.sh changes to avoid) -# Author: Sergey Kolosov -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2021 Red Hat, Inc. -# -# 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 2 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 http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/tools/glibc/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Sergey Kolosov " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test for BZ#1915330 (glibc Implement find-debuginfo.sh changes to avoid)" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 10m" >> $(METADATA) - @echo "RunFor: glibc" >> $(METADATA) - @echo "Requires: glibc glibc-debuginfo glibc-debuginfo.i686 glibc-debuginfo.x86_64" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2+" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Bug: 1915330" >> $(METADATA) - @echo "Releases: -RHEL4 -RHEL5 -RHEL6 -RHEL7 -RHEL8" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to/PURPOSE b/tests/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to/PURPOSE deleted file mode 100644 index b076330..0000000 --- a/tests/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to/PURPOSE +++ /dev/null @@ -1,5 +0,0 @@ -PURPOSE of /tools/glibc/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to -Description: Test for BZ#1915330 (glibc Implement find-debuginfo.sh changes to avoid) -Author: Sergey Kolosov -Bug summary: glibc: Implement find-debuginfo.sh changes to avoid file conflicts -Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1915330 diff --git a/tests/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to/main.fmf b/tests/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to/main.fmf deleted file mode 100644 index ba6e682..0000000 --- a/tests/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to/main.fmf +++ /dev/null @@ -1,20 +0,0 @@ -summary: Test for BZ#1915330 (glibc Implement find-debuginfo.sh changes to avoid) -description: | - Bug summary: glibc: Implement find-debuginfo.sh changes to avoid file conflicts - Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1915330 -link: - - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1915330 -contact: Sergey Kolosov -component: - - glibc -test: ./runtest.sh -framework: beakerlib -require: - - glibc - - glibc-debuginfo -recommend: - - glibc-debuginfo.i686 - - glibc-debuginfo.x86_64 -duration: 10m -extra-summary: /tools/glibc/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to -extra-task: /tools/glibc/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to diff --git a/tests/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to/runtest.sh b/tests/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to/runtest.sh deleted file mode 100755 index c232326..0000000 --- a/tests/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to/runtest.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /tools/glibc/Sanity/bz1915330-glibc-Implement-find-debuginfo-sh-changes-to -# Description: Test for BZ#1915330 (glibc Implement find-debuginfo.sh changes to avoid) -# Author: Sergey Kolosov -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2021 Red Hat, Inc. -# -# 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 2 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 http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="glibc" -DEBUGPACKAGE="glibc-debuginfo" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - PACKNVR=$(rpm -q ${PACKAGE}.`arch`) - rlPhaseEnd - - rlPhaseStartTest - rlAssertRpm ${DEBUGPACKAGE}.$(rlGetPrimaryArch) - if [[ $(rlGetSecondaryArch) ]] - then - rlAssertRpm ${DEBUGPACKAGE}.$(rlGetSecondaryArch) - fi - rlPhaseEnd - - rlPhaseStartCleanup - rlPhaseEnd -rlJournalPrintText -rlJournalEnd