Переглянути джерело

ensure that we are building really inside of our tmp directory

David Kalnischkies 15 роки тому
батько
коміт
5a635ee4ba
1 змінених файлів з 5 додано та 5 видалено
  1. 5 5
      test/integration/framework

+ 5 - 5
test/integration/framework

@@ -219,7 +219,7 @@ buildsimplenativepackage() {
 	else
 	else
 		DISTSECTION="$(echo "$SECTION" | cut -d'/' -f 1)"
 		DISTSECTION="$(echo "$SECTION" | cut -d'/' -f 1)"
 	fi
 	fi
-	local BUILDDIR=incoming/${NAME}-${VERSION}
+	local BUILDDIR=${TMPWORKINGDIRECTORY}/incoming/${NAME}-${VERSION}
 
 
 	msgninfo "Build package ${NAME} in ${VERSION} for ${RELEASE} in ${DISTSECTION}… "
 	msgninfo "Build package ${NAME} in ${VERSION} for ${RELEASE} in ${DISTSECTION}… "
 	mkdir -p $BUILDDIR/debian/source
 	mkdir -p $BUILDDIR/debian/source
@@ -259,12 +259,12 @@ Architecture: $ARCH" > ${BUILDDIR}/debian/control
 	(cd ${BUILDDIR}; dpkg-gencontrol)
 	(cd ${BUILDDIR}; dpkg-gencontrol)
 	(cd ${BUILDDIR}/debian/tmp; md5sum $(find usr/ -type f) > DEBIAN/md5sums)
 	(cd ${BUILDDIR}/debian/tmp; md5sum $(find usr/ -type f) > DEBIAN/md5sums)
 
 
-	dpkg-deb --build ${BUILDDIR}/debian/tmp incoming > /dev/null
-	echo "pool/${NAME}_${VERSION}_${ARCH}.deb" >> incoming/${RELEASE}.${DISTSECTION}.pkglist
+	dpkg-deb --build ${BUILDDIR}/debian/tmp ${BUILDDIR}/.. > /dev/null
+	echo "pool/${NAME}_${VERSION}_${ARCH}.deb" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.pkglist
 	for SRC in $SRCS; do
 	for SRC in $SRCS; do
-		echo "pool/${SRC}" >> incoming/${RELEASE}.${DISTSECTION}.srclist
+		echo "pool/${SRC}" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.srclist
 	done
 	done
-	rm -rf "incoming/${NAME}-${VERSION}"
+	rm -rf "${BUILDDIR}"
 	msgdone "info"
 	msgdone "info"
 }
 }