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 /tests/rpmconflict.at | |
| 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.
Diffstat (limited to 'tests/rpmconflict.at')
| -rw-r--r-- | tests/rpmconflict.at | 18 |
1 files changed, 9 insertions, 9 deletions
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}" |