Avoid leaking our compilation directory into test-suite
authorPanu Matilainen <pmatilai@redhat.com>
Mon, 4 Apr 2011 08:27:03 +0000 (11:27 +0300)
committerPanu Matilainen <pmatilai@redhat.com>
Mon, 4 Apr 2011 08:27:03 +0000 (11:27 +0300)
- Since they're running in fakechroot there's no need to arrange
  user writable directories this way

tests/rpmdb.at
tests/rpmquery.at

index 2675e01..c610587 100644 (file)
@@ -97,7 +97,7 @@ tpkg="hello-1.0-1.i386.rpm"
 cp "${RPMDATA}/RPMS/${tpkg}" "${RPMTEST}"
 
 runroot rpm -i \
-  --noscripts --nodeps --ignorearch --relocate=/usr="${abs_builddir}"/testing/check \
+  --noscripts --nodeps --ignorearch --relocate=/usr=/check \
   "${tpkg}"
 ],
 [0])
@@ -119,7 +119,7 @@ tpkg="hello-1.0-1.ppc64.rpm"
 cp "${RPMDATA}/RPMS/${tpkg}" "${RPMTEST}"
 
 runroot rpm -i \
-  --noscripts --nodeps --ignorearch --relocate=/usr="${abs_builddir}"/testing/check \
+  --noscripts --nodeps --ignorearch --relocate=/usr=/check \
   "${tpkg}"
 ],
 [0],
index 08fbeef..f352ea1 100644 (file)
@@ -144,7 +144,7 @@ tpkg="hello-1.0-1.ppc64.rpm"
 cp "${RPMDATA}/RPMS/$tpkg" "${RPMTEST}"
 
 runroot rpm \
-  --noscripts --nodeps --ignorearch --relocate=/usr="${abs_builddir}"/testing/check \
+  --noscripts --nodeps --ignorearch --relocate=/usr=/check \
   -i "${tpkg}"
 ],
 [0])
@@ -158,18 +158,16 @@ runroot rpm \
 ],
 [ignore])
 
-cat > expout << _ATEOF
-${abs_builddir}/testing/check/local/bin/hello
-${abs_builddir}/testing/check/share/doc/hello-1.0
-${abs_builddir}/testing/check/share/doc/hello-1.0/FAQ
-_ATEOF
 
 AT_CHECK([
 runroot rpm \
   -ql hello
 ],
 [0],
-[expout],
+[/check/local/bin/hello
+/check/share/doc/hello-1.0
+/check/share/doc/hello-1.0/FAQ
+],
 [ignore])
 
 AT_CLEANUP