diff options
author | Florian Festi <ffesti@redhat.com> | 2016-08-29 18:08:29 +0200 |
---|---|---|
committer | Florian Festi <ffesti@redhat.com> | 2016-08-29 18:12:42 +0200 |
commit | 394cbfb668655f7aa10ff6b178ec92b44a117ea6 (patch) | |
tree | 3b082d351a6635c1db57e234ad38b2fe12759e95 | |
parent | 5b8b2bdd328c36d400ea6b73869b447941173a9b (diff) | |
download | rpm-394cbfb668655f7aa10ff6b178ec92b44a117ea6.tar.gz |
tests: Do not pass real pathnames to fakechroot commands
for the remaining tests.
Also add a Provides: /bin/sh to one of the specs as the test does no longer
works without for some unknown reason.
-rw-r--r-- | tests/data/SPECS/hlinktest.spec | 1 | ||||
-rw-r--r-- | tests/rpmconfig.at | 56 | ||||
-rw-r--r-- | tests/rpmconfig2.at | 56 | ||||
-rw-r--r-- | tests/rpmconflict.at | 18 | ||||
-rw-r--r-- | tests/rpmdeps.at | 18 | ||||
-rw-r--r-- | tests/rpmreplace.at | 2 | ||||
-rw-r--r-- | tests/rpmscript.at | 2 |
7 files changed, 77 insertions, 76 deletions
diff --git a/tests/data/SPECS/hlinktest.spec b/tests/data/SPECS/hlinktest.spec index d613b3d28..2825474b2 100644 --- a/tests/data/SPECS/hlinktest.spec +++ b/tests/data/SPECS/hlinktest.spec @@ -5,6 +5,7 @@ Release: 1 License: Testing Group: Testing BuildArch: noarch +Provides: /bin/sh %description %install diff --git a/tests/rpmconfig.at b/tests/rpmconfig.at index 56437748a..e120a6f53 100644 --- a/tests/rpmconfig.at +++ b/tests/rpmconfig.at @@ -529,12 +529,12 @@ for s in "A" "B"; do done runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-1.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-1.0-1.noarch.rpm cat "${cf}" runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-2.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-2.0-1.noarch.rpm cat "${cf}" ], [0], @@ -567,14 +567,14 @@ for s in "A" "B"; do done runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-1.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-1.0-1.noarch.rpm cat "${cf}" echo "otherstuff" > "${cf}" cat "${cf}" runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-2.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-2.0-1.noarch.rpm cat "${cf}" ], [0], @@ -607,12 +607,12 @@ for s in "A" "B"; do done runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-1.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-1.0-1.noarch.rpm cat "${cf}" runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-2.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-2.0-1.noarch.rpm cat "${cf}" ], [0], @@ -644,14 +644,14 @@ for s in "A" "B"; do done runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-1.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-1.0-1.noarch.rpm cat "${cf}" echo "otherstuff" > "${RPMTEST}"/etc/my.conf cat "${cf}" runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-2.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-2.0-1.noarch.rpm cat "${cf}" cat "${cf}.rpmsave" ], @@ -687,14 +687,14 @@ for s in "A" "B"; do done runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-1.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-1.0-1.noarch.rpm cat "${cf}" echo "foo-2.0" > "${RPMTEST}"/etc/my.conf cat "${cf}" runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-2.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-2.0-1.noarch.rpm cat "${cf}" ], [0], @@ -729,14 +729,14 @@ for s in "A" "B"; do done runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-1.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-1.0-1.noarch.rpm cat "${cf}" echo "otherstuff" > "${RPMTEST}"/etc/my.conf cat "${cf}" runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-2.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-2.0-1.noarch.rpm cat "${cf}" cat "${cf}.rpmnew" ], @@ -773,14 +773,14 @@ for s in "A" "B"; do done runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-1.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-1.0-1.noarch.rpm cat "${cf}" echo "foo-2.0" > "${RPMTEST}"/etc/my.conf cat "${cf}" runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-2.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-2.0-1.noarch.rpm cat "${cf}" ], [0], diff --git a/tests/rpmconfig2.at b/tests/rpmconfig2.at index e6fa39a3d..ae064107f 100644 --- a/tests/rpmconfig2.at +++ b/tests/rpmconfig2.at @@ -487,12 +487,12 @@ for s in "A" "B"; do done runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-1.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-1.0-1.noarch.rpm readlink "${cf}" runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-2.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-2.0-1.noarch.rpm readlink "${cf}" ], [0], @@ -526,14 +526,14 @@ for s in "A" "B"; do done runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-1.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-1.0-1.noarch.rpm readlink "${cf}" ln -sf "otherstuff" "${cf}" readlink "${cf}" runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-2.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-2.0-1.noarch.rpm readlink "${cf}" ], [0], @@ -567,12 +567,12 @@ for s in "A" "B"; do done runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-1.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-1.0-1.noarch.rpm readlink "${cf}" runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-2.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-2.0-1.noarch.rpm readlink "${cf}" ], [0], @@ -605,14 +605,14 @@ for s in "A" "B"; do done runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-1.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-1.0-1.noarch.rpm readlink "${cf}" ln -sf "otherstuff" "${cf}" readlink "${cf}" runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-2.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-2.0-1.noarch.rpm readlink "${cf}" readlink "${cf}.rpmsave" ], @@ -649,14 +649,14 @@ for s in "A" "B"; do done runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-1.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-1.0-1.noarch.rpm readlink "${cf}" ln -sf "foo-2.0" "${cf}" readlink "${cf}" runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-2.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-2.0-1.noarch.rpm readlink "${cf}" ], [0], @@ -692,14 +692,14 @@ for s in "A" "B"; do done runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-1.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-1.0-1.noarch.rpm readlink "${cf}" ln -sf "otherstuff" "${cf}" readlink "${cf}" runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-2.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-2.0-1.noarch.rpm readlink "${cf}" readlink "${cf}.rpmnew" ], @@ -737,14 +737,14 @@ for s in "A" "B"; do done runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-1.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-1.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-1.0-1.noarch.rpm readlink "${cf}" ln -sf "foo-2.0" "${cf}" readlink "${cf}" runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/configtest-B-2.0-1.noarch.rpm + /build/RPMS/noarch/configtest-A-2.0-1.noarch.rpm \ + /build/RPMS/noarch/configtest-B-2.0-1.noarch.rpm readlink "${cf}" test ! -L "${cf}.rpmnew" ], diff --git a/tests/rpmconflict.at b/tests/rpmconflict.at index f3e9f5a14..ba6b41aab 100644 --- a/tests/rpmconflict.at +++ b/tests/rpmconflict.at @@ -35,8 +35,8 @@ RPMDB_CLEAR RPMDB_INIT runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/conflictone-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/conflicttwo-1.0-1.noarch.rpm + /build/RPMS/noarch/conflictone-1.0-1.noarch.rpm \ + /build/RPMS/noarch/conflicttwo-1.0-1.noarch.rpm ], [2], [ignore], @@ -76,8 +76,8 @@ RPMDB_CLEAR RPMDB_INIT runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/conflictone-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/conflicttwo-1.0-1.noarch.rpm + /build/RPMS/noarch/conflictone-1.0-1.noarch.rpm \ + /build/RPMS/noarch/conflicttwo-1.0-1.noarch.rpm ], [0], [ignore], @@ -288,7 +288,7 @@ runroot rpm -U --ignoreos --ignorearch --nodeps \ --define "_transaction_color 3" \ --define "_prefer_color 2" \ /data/RPMS/hello-2.0-1.x86_64.rpm \ - "${TOPDIR}"/RPMS/noarch/hello-script-1.0-1.noarch.rpm + /build/RPMS/noarch/hello-script-1.0-1.noarch.rpm ], [2], [], @@ -313,7 +313,7 @@ runroot rpm -U --ignoreos --ignorearch --nodeps \ runroot rpm -U --ignoreos --ignorearch --nodeps \ --define "_transaction_color 3" \ --define "_prefer_color 2" \ - "${TOPDIR}"/RPMS/noarch/hello-script-1.0-1.noarch.rpm + /build/RPMS/noarch/hello-script-1.0-1.noarch.rpm ], [1], [], @@ -333,7 +333,7 @@ runroot rpmbuild --quiet -bb /data/SPECS/hello-script.spec runroot rpm -U --ignoreos --ignorearch --nodeps \ --define "_transaction_color 3" \ --define "_prefer_color 2" \ - "${TOPDIR}"/RPMS/noarch/hello-script-1.0-1.noarch.rpm + /build/RPMS/noarch/hello-script-1.0-1.noarch.rpm runroot rpm -U --ignoreos --ignorearch --nodeps \ --define "_transaction_color 3" \ @@ -414,8 +414,8 @@ runroot rpmbuild --quiet -bb \ test ! -f "${fn}" && echo OK runroot rpm -U \ - "${TOPDIR}"/RPMS/noarch/conflictone-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/conflicttwo-1.0-1.noarch.rpm + /build/RPMS/noarch/conflictone-1.0-1.noarch.rpm \ + /build/RPMS/noarch/conflicttwo-1.0-1.noarch.rpm cat "${fn}" runroot rpm -e conflicttwo cat "${fn}" diff --git a/tests/rpmdeps.at b/tests/rpmdeps.at index 824688b4a..6730d2299 100644 --- a/tests/rpmdeps.at +++ b/tests/rpmdeps.at @@ -44,7 +44,7 @@ runroot rpmbuild --quiet -bb \ --define "reqs deptest-one" \ /data/SPECS/deptest.spec -runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm +runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm ], [0], [], @@ -70,7 +70,7 @@ runroot rpmbuild --quiet -bb \ --define "provs deptest-foo = 1.0" \ /data/SPECS/deptest.spec -runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm +runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm ], [2], [], @@ -98,7 +98,7 @@ runroot rpmbuild --quiet -bb \ --define "provs deptest-foo = 2.0" \ /data/SPECS/deptest.spec -runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm +runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm ], [0], [], @@ -123,7 +123,7 @@ runroot rpmbuild --quiet -bb \ --define "pkg two" \ /data/SPECS/deptest.spec -runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm +runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm ], [2], [], @@ -199,8 +199,8 @@ runroot rpmbuild --quiet -bb \ /data/SPECS/deptest.spec runroot rpm -U --test \ - "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm \ - "${TOPDIR}"/RPMS/noarch/deptest-two-1.0-1.noarch.rpm + /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm \ + /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm runroot rpm -U /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm runroot rpm -e deptest-one @@ -238,7 +238,7 @@ runroot rpmbuild --quiet -bb \ --define "provs deptest-foo = 2.0" \ /data/SPECS/deptest.spec -runroot rpm -U "${TOPDIR}"/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm +runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm runroot rpm -e deptest-two ], [1], @@ -266,7 +266,7 @@ runroot rpm -U --ignoreos --ignorearch --nodeps \ --define "_prefer_color 2" \ /data/RPMS/hello-2.0-1.i686.rpm \ /data/RPMS/hello-2.0-1.x86_64.rpm \ - "${TOPDIR}"/RPMS/noarch/deptest-hello-1.0-1.noarch.rpm + /build/RPMS/noarch/deptest-hello-1.0-1.noarch.rpm runroot rpm -e hello.x86_64 ], @@ -295,7 +295,7 @@ runroot rpm -U --ignoreos --ignorearch --nodeps \ --define "_prefer_color 2" \ /data/RPMS/hello-2.0-1.i686.rpm \ /data/RPMS/hello-2.0-1.x86_64.rpm \ - "${TOPDIR}"/RPMS/noarch/deptest-hello-1.0-1.noarch.rpm + /build/RPMS/noarch/deptest-hello-1.0-1.noarch.rpm runroot rpm -e hello.i686 ], diff --git a/tests/rpmreplace.at b/tests/rpmreplace.at index d87c28c93..90a85bfb8 100644 --- a/tests/rpmreplace.at +++ b/tests/rpmreplace.at @@ -561,7 +561,7 @@ runroot rpmbuild --quiet -bb \ /data/SPECS/replacetest.spec runroot rpm -U /build/RPMS/noarch/replacetest-1.0-1.noarch.rpm -test -d "${tf}" && runroot rpm -U --test "${TOPDIR}"/RPMS/noarch/replacetest-2.0-1.noarch.rpm && runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm +test -d "${tf}" && runroot rpm -U --test /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm && runroot rpm -U /build/RPMS/noarch/replacetest-2.0-1.noarch.rpm readlink "${tf}" ], [0], diff --git a/tests/rpmscript.at b/tests/rpmscript.at index 6c1b815e5..1ac7fcda2 100644 --- a/tests/rpmscript.at +++ b/tests/rpmscript.at @@ -115,7 +115,7 @@ runroot rpm -U /build/RPMS/noarch/fakeshell-1.0-1.noarch.rpm runroot rpm -U /build/RPMS/noarch/filetriggers-1.0-1.noarch.rpm echo INSTALLATION runroot rpm -U /build/RPMS/noarch/hello-script-1.0-1.noarch.rpm \ -"${TOPDIR}"/RPMS/noarch/hlinktest-1.0-1.noarch.rpm +/build/RPMS/noarch/hlinktest-1.0-1.noarch.rpm echo ERASE runroot rpm -e hello-script hlinktest ], |