diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2011-04-04 11:39:25 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2011-04-04 11:39:25 +0300 |
| commit | 72b21d5ffc86b0091af93a5c3aaa378da3fb8f6b (patch) | |
| tree | a8139cf7f297df1ef4b6b215ff83dddd9711c9ee /tests | |
| parent | 1743c9eba97b004b57adbe95d97b89d464c47377 (diff) | |
| download | rpm-72b21d5ffc86b0091af93a5c3aaa378da3fb8f6b.tar.gz rpm-72b21d5ffc86b0091af93a5c3aaa378da3fb8f6b.tar.bz2 rpm-72b21d5ffc86b0091af93a5c3aaa378da3fb8f6b.zip | |
Remove redundant data copying into test-suite root
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rpmdb.at | 18 | ||||
| -rw-r--r-- | tests/rpmquery.at | 5 | ||||
| -rw-r--r-- | tests/rpmverify.at | 18 |
3 files changed, 11 insertions, 30 deletions
diff --git a/tests/rpmdb.at b/tests/rpmdb.at index c61058776..8ef371146 100644 --- a/tests/rpmdb.at +++ b/tests/rpmdb.at @@ -55,11 +55,8 @@ AT_CHECK([ RPMDB_CLEAR RPMDB_INIT -tpkg="foo-1.0-1.noarch.rpm" -cp "${RPMDATA}/RPMS/${tpkg}" "${RPMTEST}" - runroot rpm -i \ - "${tpkg}" + /data/RPMS/foo-1.0-1.noarch.rpm ], [0]) @@ -74,8 +71,7 @@ AT_CHECK([ RPMDB_CLEAR RPMDB_INIT -tpkg="foo-1.0-1.noarch.rpm" -cp "${RPMDATA}/RPMS/${tpkg}" "${RPMTEST}" +tpkg="/data/RPMS/foo-1.0-1.noarch.rpm" runroot rpm -i "${tpkg}" && runroot rpm -U --replacepkgs "${tpkg}" ], @@ -93,12 +89,9 @@ AT_CHECK([ RPMDB_CLEAR RPMDB_INIT -tpkg="hello-1.0-1.i386.rpm" -cp "${RPMDATA}/RPMS/${tpkg}" "${RPMTEST}" - runroot rpm -i \ --noscripts --nodeps --ignorearch --relocate=/usr=/check \ - "${tpkg}" + /data/RPMS/hello-1.0-1.i386.rpm ], [0]) @@ -115,12 +108,9 @@ AT_CHECK([ RPMDB_CLEAR RPMDB_INIT -tpkg="hello-1.0-1.ppc64.rpm" -cp "${RPMDATA}/RPMS/${tpkg}" "${RPMTEST}" - runroot rpm -i \ --noscripts --nodeps --ignorearch --relocate=/usr=/check \ - "${tpkg}" + /data/RPMS/hello-1.0-1.ppc64.rpm ], [0], [ignore], diff --git a/tests/rpmquery.at b/tests/rpmquery.at index f352ea133..74643da0f 100644 --- a/tests/rpmquery.at +++ b/tests/rpmquery.at @@ -140,12 +140,9 @@ AT_CHECK([ RPMDB_CLEAR RPMDB_INIT -tpkg="hello-1.0-1.ppc64.rpm" -cp "${RPMDATA}/RPMS/$tpkg" "${RPMTEST}" - runroot rpm \ --noscripts --nodeps --ignorearch --relocate=/usr=/check \ - -i "${tpkg}" + -i /data/RPMS/hello-1.0-1.ppc64.rpm ], [0]) diff --git a/tests/rpmverify.at b/tests/rpmverify.at index bf068448d..c19e331e8 100644 --- a/tests/rpmverify.at +++ b/tests/rpmverify.at @@ -35,10 +35,8 @@ AT_CHECK([ RPMDB_CLEAR RPMDB_INIT -tpkg="hello-1.0-1.i386.rpm" -cp "${RPMDATA}/RPMS/${tpkg}" "${RPMTEST}" - -runroot rpm -U --nodeps --noscripts --ignorearch --ignoreos "${tpkg}" +runroot rpm -U --nodeps --noscripts --ignorearch --ignoreos \ + /data/RPMS/hello-1.0-1.i386.rpm runroot rpm -Va --nodeps --nouser --nogroup ], [0], @@ -53,10 +51,8 @@ AT_CHECK([ RPMDB_CLEAR RPMDB_INIT -tpkg="hello-1.0-1.i386.rpm" -cp "${RPMDATA}/RPMS/${tpkg}" "${RPMTEST}" - -runroot rpm -U --nodeps --noscripts --ignorearch --ignoreos "${tpkg}" +runroot rpm -U --nodeps --noscripts --ignorearch --ignoreos \ + /data/RPMS/hello-1.0-1.i386.rpm runroot rpm -Vva --nodeps --nouser --nogroup ], [0], @@ -74,10 +70,8 @@ AT_CHECK([ RPMDB_CLEAR RPMDB_INIT -tpkg="hello-1.0-1.i386.rpm" -cp "${RPMDATA}/RPMS/${tpkg}" "${RPMTEST}" - -runroot rpm -U --nodeps --noscripts --ignorearch --ignoreos "${tpkg}" +runroot rpm -U --nodeps --noscripts --ignorearch --ignoreos \ + /data/RPMS/hello-1.0-1.i386.rpm rm -f "${RPMTEST}"/usr/share/doc/hello-1.0/FAQ chmod u-x "${RPMTEST}"/usr/local/bin/hello dd if=/dev/zero of="${RPMTEST}"/usr/local/bin/hello \ |