From 082d2ec5c5e78151333d70c7fec38aaee789c2fb Mon Sep 17 00:00:00 2001 From: Lukas Zachar Date: Mon, 5 Dec 2022 15:22:54 +0100 Subject: [PATCH] Remove Makefile/PURPOSE file, add summary/description --- main.fmf | 2 - run-basic-rails-application/Makefile | 64 ----------------------- run-basic-rails-application/PURPOSE | 5 -- run-basic-rails-application/main.fmf | 7 ++- systemtap-static-probes-in-ruby/Makefile | 65 ------------------------ systemtap-static-probes-in-ruby/PURPOSE | 1 - systemtap-static-probes-in-ruby/main.fmf | 12 +++++ 7 files changed, 17 insertions(+), 139 deletions(-) delete mode 100644 run-basic-rails-application/Makefile delete mode 100644 run-basic-rails-application/PURPOSE delete mode 100644 systemtap-static-probes-in-ruby/Makefile delete mode 100644 systemtap-static-probes-in-ruby/PURPOSE create mode 100644 systemtap-static-probes-in-ruby/main.fmf diff --git a/main.fmf b/main.fmf index d5056fd..08c3b8c 100644 --- a/main.fmf +++ b/main.fmf @@ -2,5 +2,3 @@ contact: Vít Ondruch test: ./runtest.sh framework: beakerlib -/systemtap-static-probes-in-ruby: - component: systemtap diff --git a/run-basic-rails-application/Makefile b/run-basic-rails-application/Makefile deleted file mode 100644 index 5de7f8f..0000000 --- a/run-basic-rails-application/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/rubygem-rails/run-basic-rails-application -# Description: Test creates new rails application and runs it -# Author: Iveta Senfeldova -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2012 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/rubygem-rails/run-basic-rails-application -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: Iveta Senfeldova " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test creates new rails application in collection and runs it" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 60m" >> $(METADATA) - @echo "RunFor: rubygem-rails ruby" >> $(METADATA) - @echo "Requires: rubygems rubygem-rails ruby-devel sqlite-devel libxml2-devel libxslt-devel gcc-c++ net-tools procps-ng psmisc" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/run-basic-rails-application/PURPOSE b/run-basic-rails-application/PURPOSE deleted file mode 100644 index ae007e0..0000000 --- a/run-basic-rails-application/PURPOSE +++ /dev/null @@ -1,5 +0,0 @@ -PURPOSE of /CoreOS/rubygem-rails/run-basic-rails-application -Description: Test creates new rails application and runs it -Author: Iveta Senfeldova - -Test ensure it is possible to create new rails application and run it. diff --git a/run-basic-rails-application/main.fmf b/run-basic-rails-application/main.fmf index 6f900ea..0c22076 100644 --- a/run-basic-rails-application/main.fmf +++ b/run-basic-rails-application/main.fmf @@ -4,10 +4,12 @@ adjust: - rubypick environment: PACKAGES: "ruby rubygems" - +summary: Test creates new rails application in collection and runs it +description: | + Test ensures it is possible to create new rails application and run it. component: - rubygem-rails - +- ruby require: - ruby - ruby-devel @@ -16,3 +18,4 @@ require: - git-core - rubygems - rubypick +duration: 20m diff --git a/systemtap-static-probes-in-ruby/Makefile b/systemtap-static-probes-in-ruby/Makefile deleted file mode 100644 index 011d562..0000000 --- a/systemtap-static-probes-in-ruby/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/ruby/Regression/systemtap-static-probes-in-ruby -# Description: It tests there are static probes in ruby package. -# Author: Ales Marecek -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2011 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/ruby/Regression/systemtap-static-probes-in-ruby -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) - chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - --include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Iveta Senfeldova " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: It tests there are static probes in ruby package." >> $(METADATA) - @echo "Type: Regression" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: ruby" >> $(METADATA) - @echo "Requires: ruby ruby-doc ruby-libs systemtap grep procps-ng" >> $(METADATA) - @echo "Releases: RHEL6" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Bug: 673162" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/systemtap-static-probes-in-ruby/PURPOSE b/systemtap-static-probes-in-ruby/PURPOSE deleted file mode 100644 index 13edbcf..0000000 --- a/systemtap-static-probes-in-ruby/PURPOSE +++ /dev/null @@ -1 +0,0 @@ -Simple test to exercise ruby's systemtap API. diff --git a/systemtap-static-probes-in-ruby/main.fmf b/systemtap-static-probes-in-ruby/main.fmf new file mode 100644 index 0000000..104dfcb --- /dev/null +++ b/systemtap-static-probes-in-ruby/main.fmf @@ -0,0 +1,12 @@ +summary: It tests there are static probes in ruby package. +description: | + Simple test to exercise ruby's systemtap API. +component: +- systemtap +- ruby +require: +- systemtap +- ruby-doc +- ruby +- /usr/share/doc/ruby-doc/ruby-exercise.stp +duration: 30m