Add keywords to all tests

- just initial groupings to have something there..

diff --git a/tests/rpmbuild.at b/tests/rpmbuild.at
index aa67e37..4addd1a 100644 (file)
--- a/tests/rpmbuild.at
+++ b/tests/rpmbuild.at
@@ -21,6 +21,7 @@ AT_BANNER([RPM build])
 # ------------------------------
 # Check if rpmbuild -ba *.spec works
 AT_SETUP([rpmbuild -ba *.spec])
+AT_KEYWORDS([build])
 AT_CHECK([
 rm -rf ${TOPDIR}
 AS_MKDIR_P(${TOPDIR}/SOURCES)
@@ -39,6 +40,7 @@ AT_CLEANUP
 # Check if rpmbuild -ba *.spec 
 # honours a relative topdir with --root
 AT_SETUP([rpmbuild --root=... -ba *.spec])
+AT_KEYWORDS([build])
 AT_XFAIL_IF([test $RPM_XFAIL -gt 0])
 AT_CHECK([
 rm -rf ${TOPDIR}
@@ -58,6 +60,7 @@ AT_CLEANUP
 # ------------------------------
 # Check if rpmbuild --rebuild *.src.rpm works
 AT_SETUP([rpmbuild --rebuild])
+AT_KEYWORDS([build])
 AT_CHECK([
 rm -rf ${TOPDIR}
 
@@ -73,6 +76,7 @@ AT_CLEANUP
 # Check if rpmbuild --rebuild *.src.rpm
 # honours a relative topdir with --root
 AT_SETUP([rpmbuild --root=... --rebuild])
+AT_KEYWORDS([build])
 AT_XFAIL_IF([test $RPM_XFAIL -gt 0])
 AT_CHECK([
 rm -rf ${TOPDIR}
@@ -89,6 +93,7 @@ AT_CLEANUP
 # ------------------------------
 # Check if tar unpacking works
 AT_SETUP([rpmbuild -tb <tar with bad spec>])
+AT_KEYWORDS([build])
 AT_CHECK([
 rm -rf ${TOPDIR}
 
@@ -105,6 +110,7 @@ AT_CLEANUP
 # Check if tar build works
 # TODO: test that the rpms are actually created...
 AT_SETUP([rpmbuild -tb])
+AT_KEYWORDS([build])
 AT_CHECK([
 rm -rf ${TOPDIR}
 

diff --git a/tests/rpmconfig.at b/tests/rpmconfig.at
index 6f33f94..cbf4868 100644 (file)
--- a/tests/rpmconfig.at
+++ b/tests/rpmconfig.at
@@ -5,6 +5,7 @@ AT_BANNER([RPM config file behavior])
 # ------------------------------
 # (Build and) upgrade package with config file, no backup here
 AT_SETUP([rpm -U to package with unchanged config file])
+AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
 rm -rf "${TOPDIR}"
@@ -27,6 +28,7 @@ AT_CLEANUP
 # ------------------------------
 # Upgrade package with locally modified config file, unchanged in pkg
 AT_SETUP([rpm -U to package with locally modified config file])
+AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
 rm -rf "${TOPDIR}"
@@ -50,6 +52,7 @@ AT_CLEANUP
 # ------------------------------
 # Upgrade package with unmodified config file, changed in pkg
 AT_SETUP([rpm -U to package with unchanged config file])
+AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
 rm -rf "${TOPDIR}"
@@ -72,6 +75,7 @@ AT_CLEANUP
 # ------------------------------
 # Upgrade package with locally modified config file, changed in pkg
 AT_SETUP([rpm -U to package with modified config file])
+AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
 rm -rf "${TOPDIR}"

diff --git a/tests/rpmconflict.at b/tests/rpmconflict.at
index a846d7b..9e021a2 100644 (file)
--- a/tests/rpmconflict.at
+++ b/tests/rpmconflict.at
@@ -5,6 +5,7 @@ AT_BANNER([RPM file conflicts])
 # ------------------------------
 # (Build and) install conflicting package (should fail)
 AT_SETUP([rpm -U to package with file conflict])
+AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
 rm -rf "${TOPDIR}"
@@ -27,6 +28,7 @@ AT_CLEANUP
 # ------------------------------
 # Install conflicting packages in same transaction (should fail)
 AT_SETUP([rpm -U two packages with a conflicting file])
+AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
 
@@ -42,6 +44,7 @@ AT_CLEANUP
 # ------------------------------
 # (Build and) install package with shareable file
 AT_SETUP([rpm -U package with shareable file])
+AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
 rm -rf "${TOPDIR}"
@@ -64,6 +67,7 @@ AT_CLEANUP
 # ------------------------------
 # Install packages with shareable file in same transaction
 AT_SETUP([rpm -U two packages with shareable file])
+AT_KEYWORDS([install])
 AT_CHECK([
 RPMDB_CLEAR
 

diff --git a/tests/rpmdb.at b/tests/rpmdb.at
index 3180538..2f784ad 100644 (file)
--- a/tests/rpmdb.at
+++ b/tests/rpmdb.at
@@ -21,6 +21,7 @@ AT_BANNER([RPM database access])
 # ------------------------------
 # Attempt to initialize a rpmdb
 AT_SETUP([rpm --initdb])
+AT_KEYWORDS([rpmdb])
 AT_CHECK([
 RPMDB_CLEAR
 RPMDB_INIT
@@ -33,6 +34,7 @@ AT_CLEANUP
 # ------------------------------
 # Run rpm -qa on an empty rpmdb
 AT_SETUP([rpm -qa])
+AT_KEYWORDS([rpmdb query])
 AT_CHECK([
 RPMDB_CLEAR
 RPMDB_INIT
@@ -47,6 +49,7 @@ AT_CLEANUP
 # install a noarch package into a local rpmdb without --relocate and --nodeps
 # * Should always succeed
 AT_SETUP([rpm -i *.noarch.rpm])
+AT_KEYWORDS([rpmdb install])
 
 AT_CHECK([
 RPMDB_CLEAR
@@ -68,6 +71,7 @@ AT_CLEANUP
 # * Shall only work with relocation
 # * Use --ignorearch because we don't know the arch
 AT_SETUP([rpm -i --relocate=.. *.i386.rpm])
+AT_KEYWORDS([rpmdb install])
 AT_CHECK([
 RPMDB_CLEAR
 RPMDB_INIT
@@ -89,6 +93,7 @@ AT_CLEANUP
 # * Shall only work with relocation
 # * Use --ignorearch because we don't know the arch
 AT_SETUP([rpm -i --relocate=.. *.ppc64.rpm])
+AT_KEYWORDS([rpmdb install])
 AT_CHECK([
 RPMDB_CLEAR
 RPMDB_INIT

diff --git a/tests/rpmgeneral.at b/tests/rpmgeneral.at
index bc0d93b..d6f11a5 100644 (file)
--- a/tests/rpmgeneral.at
+++ b/tests/rpmgeneral.at
@@ -20,6 +20,7 @@ AT_BANNER([Basic tests])
 
 # ------------------------------
 AT_SETUP([rpm --version])
+AT_KEYWORDS([basic])
 AT_CHECK([run rpm --version],[0],
 [RPM version AT_PACKAGE_VERSION
 ])
@@ -28,6 +29,7 @@ AT_CLEANUP
 
 # ------------------------------
 AT_SETUP([rpmbuild --version])
+AT_KEYWORDS([basic])
 AT_CHECK([run rpmbuild --version],[0],
 [RPM version AT_PACKAGE_VERSION
 ])
@@ -36,6 +38,7 @@ AT_CLEANUP
 
 # ------------------------------
 AT_SETUP([rpm --version])
+AT_KEYWORDS([basic])
 AT_CHECK([run rpm --version],[0],
 [RPM version AT_PACKAGE_VERSION
 ])
@@ -44,6 +47,7 @@ AT_CLEANUP
 
 # ------------------------------
 AT_SETUP([rpm --version])
+AT_KEYWORDS([basic])
 AT_CHECK([run rpm --version],[0],
 [RPM version AT_PACKAGE_VERSION
 ])
@@ -52,6 +56,7 @@ AT_CLEANUP
 
 # ------------------------------
 AT_SETUP([rpm --showrc])
+AT_KEYWORDS([basic])
 AT_CHECK([run rpm --showrc],[0],
 [ignore])
 AT_CLEANUP
@@ -61,6 +66,7 @@ AT_CLEANUP
 # Check rpm --querytags
 # * Some versions of rpm append extraneous whitespaces
 AT_SETUP([rpm --querytags])
+AT_KEYWORDS([basic])
 AT_CHECK([run rpm --querytags],[0],
 [ARCH
 ARCHIVESIZE

diff --git a/tests/rpmi.at b/tests/rpmi.at
index fd8baba..c4063be 100644 (file)
--- a/tests/rpmi.at
+++ b/tests/rpmi.at
@@ -21,6 +21,7 @@ AT_BANNER([RPM install tests])
 # ------------------------------
 # Check if rpm -U *.src.rpm works
 AT_SETUP([rpm -U *.src.rpm])
+AT_KEYWORDS([install])
 AT_CHECK([
 rm -rf ${TOPDIR}
 
@@ -35,6 +36,7 @@ AT_CLEANUP
 # ------------------------------
 # Check if rpm -i *.src.rpm works
 AT_SETUP([rpm -i *.src.rpm])
+AT_KEYWORDS([install])
 AT_CHECK([
 rm -rf ${TOPDIR}
 
@@ -50,6 +52,7 @@ AT_CLEANUP
 # Various error behavior tests
 #
 AT_SETUP([rpm -i <nonexistent file>])
+AT_KEYWORDS([install])
 AT_CHECK([
 run rpm \
   -i no_such_file
@@ -61,6 +64,7 @@ AT_CLEANUP
 
 # XXX hmm, --nomanifest seems broken atm...
 AT_SETUP([rpm -i --nomanifest <garbage text file>])
+AT_KEYWORDS([install])
 AT_CHECK([
 junk="${RPMTEST}/textfile"
 cat << EOF > "${junk}"
@@ -77,6 +81,7 @@ run rpm \
 AT_CLEANUP
 
 AT_SETUP([rpm -i <garbage text file])
+AT_KEYWORDS([install])
 AT_CHECK([
 junk="${RPMTEST}/not_an.rpm"
 cat << EOF > "${junk}"

diff --git a/tests/rpmmacro.at b/tests/rpmmacro.at
index bda7695..36e9605 100644 (file)
--- a/tests/rpmmacro.at
+++ b/tests/rpmmacro.at
@@ -4,6 +4,7 @@ AT_BANNER([RPM macros])
 
 # ------------------------------
 AT_SETUP([simple rpm --eval])
+AT_KEYWORDS([macros])
 AT_CHECK([
 run rpm --define "this that" --eval '%{this}'
 ],
@@ -13,6 +14,7 @@ run rpm --define "this that" --eval '%{this}'
 AT_CLEANUP
 
 AT_SETUP([simple true conditional rpm --eval])
+AT_KEYWORDS([macros])
 AT_CHECK([
 run rpm --define "this that" --eval '%{?this}'
 ],
@@ -22,6 +24,7 @@ run rpm --define "this that" --eval '%{?this}'
 AT_CLEANUP
 
 AT_SETUP([simple false conditional rpm --eval])
+AT_KEYWORDS([macros])
 AT_CHECK([
 run rpm --define "this that" --eval '%{?that}'
 ],
@@ -31,6 +34,7 @@ run rpm --define "this that" --eval '%{?that}'
 AT_CLEANUP
 
 AT_SETUP([uncompress macro])
+AT_KEYWORDS([macros])
 AT_CHECK([
 (cd ${RPMDATA}/SOURCES/ &&
   run rpm \
@@ -44,6 +48,7 @@ AT_CHECK([
 AT_CLEANUP
 
 AT_SETUP([basename macro])
+AT_KEYWORDS([macros])
 AT_CHECK([
 (cd ${RPMDATA}/SOURCES/ &&
   run rpm \
@@ -56,6 +61,7 @@ AT_CHECK([
 AT_CLEANUP
 
 AT_SETUP([suffix macro])
+AT_KEYWORDS([macros])
 AT_CHECK([
 (cd ${RPMDATA}/SOURCES/ &&
   run rpm \
@@ -68,6 +74,7 @@ AT_CHECK([
 AT_CLEANUP
 
 AT_SETUP([url2path macro])
+AT_KEYWORDS([macros])
 AT_CHECK([
 (cd ${RPMDATA}/SOURCES/ &&
   run rpm \
@@ -80,6 +87,7 @@ AT_CHECK([
 AT_CLEANUP
 
 AT_SETUP([shell expansion])
+AT_KEYWORDS([macros])
 AT_CHECK([
 (cd ${RPMDATA}/SOURCES/ &&
   run rpm \
@@ -92,6 +100,7 @@ AT_CHECK([
 AT_CLEANUP
 
 AT_SETUP([simple lua --eval])
+AT_KEYWORDS([macros lua])
 AT_CHECK([
 run rpm --eval '%{lua:print(5*5)}'
 ],
@@ -101,6 +110,7 @@ run rpm --eval '%{lua:print(5*5)}'
 AT_CLEANUP
 
 AT_SETUP([lua rpm extensions])
+AT_KEYWORDS([macros lua])
 AT_CHECK([
 run rpm --eval '%{lua: rpm.define("foo bar") print(rpm.expand("%{foo}"))}'
 ],
@@ -110,6 +120,7 @@ run rpm --eval '%{lua: rpm.define("foo bar") print(rpm.expand("%{foo}"))}'
 AT_CLEANUP
 
 AT_SETUP([lua posix extensions])
+AT_KEYWORDS([macros lua])
 AT_CHECK([
 run rpm \
   --eval '%{lua: posix.putenv("LUATEST=ok") print(posix.getenv("LUATEST"))}'

diff --git a/tests/rpmquery.at b/tests/rpmquery.at
index cc2bf82..162b6a7 100644 (file)
--- a/tests/rpmquery.at
+++ b/tests/rpmquery.at
@@ -20,6 +20,7 @@ AT_BANNER([RPM queries])
 
 # ------------------------------
 AT_SETUP([rpm --qf -p *.i386.rpm])
+AT_KEYWORDS([query])
 AT_CHECK([
 run rpm \
   -q --qf "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n" \
@@ -33,6 +34,7 @@ AT_CLEANUP
 
 # ------------------------------
 AT_SETUP([rpm --qf -p *.src.rpm])
+AT_KEYWORDS([query])
 AT_CHECK([
 run rpm \
   -q --qf "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n" \
@@ -46,6 +48,7 @@ AT_CLEANUP
 
 # ------------------------------
 AT_SETUP([rpm -ql -p *.src.rpm])
+AT_KEYWORDS([query])
 AT_CHECK([
 run rpm \
   -ql \
@@ -60,6 +63,7 @@ AT_CLEANUP
 
 # ------------------------------
 AT_SETUP([rpm -ql -p *.i386.rpm])
+AT_KEYWORDS([query])
 AT_CHECK([
 rpm \
   -ql \
@@ -78,6 +82,7 @@ AT_CLEANUP
 # Try to check "scripts"
 # * Gets rpmpopt-$(VERSION) involved
 AT_SETUP([rpm -q --scripts -p *.i386.rpm])
+AT_KEYWORDS([query])
 AT_CHECK([
 run rpm \
   -q --scripts \
@@ -98,6 +103,7 @@ AT_CLEANUP
 # * Shall only work with relocation
 # * Use --ignorearch because we don't know the arch
 AT_SETUP([rpm -qil hello])
+AT_KEYWORDS([rpmdb install query])
 
 AT_CHECK([
 RPMDB_CLEAR