소스 검색

be able to set priorities for created test packages

David Kalnischkies 15 년 전
부모
커밋
d67004e086
1개의 변경된 파일30개의 추가작업 그리고 21개의 파일을 삭제
  1. 30 21
      test/integration/framework

+ 30 - 21
test/integration/framework

@@ -218,6 +218,7 @@ buildsimplenativepackage() {
 	local DEPENDENCIES="$5"
 	local DEPENDENCIES="$5"
 	local DESCRIPTION="$6"
 	local DESCRIPTION="$6"
 	local SECTION="${7:-others}"
 	local SECTION="${7:-others}"
+	local PRIORITY="${8:-optional}"
 	local DISTSECTION
 	local DISTSECTION
 	if [ "$SECTION" = "$(echo "$SECTION" | cut -d'/' -f 2)" ]; then
 	if [ "$SECTION" = "$(echo "$SECTION" | cut -d'/' -f 2)" ]; then
 		DISTSECTION="main"
 		DISTSECTION="main"
@@ -240,7 +241,7 @@ echo '$NAME says \"Hello!\"'" > ${BUILDDIR}/${NAME}
  -- Joe Sixpack <joe@example.org>  $(date -R)" > ${BUILDDIR}/debian/changelog
  -- Joe Sixpack <joe@example.org>  $(date -R)" > ${BUILDDIR}/debian/changelog
 	echo "Source: $NAME
 	echo "Source: $NAME
 Section: $SECTION
 Section: $SECTION
-Priority: optional
+Priority: $PRIORITY
 Maintainer: Joe Sixpack <joe@example.org>
 Maintainer: Joe Sixpack <joe@example.org>
 Standards-Version: 3.9.1
 Standards-Version: 3.9.1
 
 
@@ -396,29 +397,34 @@ insertpackage() {
 	local ARCH="$3"
 	local ARCH="$3"
 	local VERSION="$4"
 	local VERSION="$4"
 	local DEPENDENCIES="$5"
 	local DEPENDENCIES="$5"
-	local ARCHS="$ARCH"
-	if [ "$ARCHS" = "all" ]; then
-		ARCHS="$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
-	fi
-	for BUILDARCH in $ARCHS; do
-		local PPATH="aptarchive/dists/${RELEASE}/main/binary-${BUILDARCH}"
-		mkdir -p $PPATH aptarchive/dists/${RELEASE}/main/source
-		touch aptarchive/dists/${RELEASE}/main/source/Sources
-		local FILE="${PPATH}/Packages"
-		echo "Package: $NAME
-Priority: optional
+	local PRIORITY="${6:-optional}"
+	local ARCHS=""
+	for arch in $(echo "$ARCH" | sed -e 's#,#\n#g'); do
+		if [ "$arch" = "all" ]; then
+			ARCHS="$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
+		else
+			ARCHS="$arch"
+		fi
+		for BUILDARCH in $ARCHS; do
+			local PPATH="aptarchive/dists/${RELEASE}/main/binary-${BUILDARCH}"
+			mkdir -p $PPATH aptarchive/dists/${RELEASE}/main/source
+			touch aptarchive/dists/${RELEASE}/main/source/Sources
+			local FILE="${PPATH}/Packages"
+			echo "Package: $NAME
+Priority: $PRIORITY
 Section: other
 Section: other
 Installed-Size: 42
 Installed-Size: 42
 Maintainer: Joe Sixpack <joe@example.org>
 Maintainer: Joe Sixpack <joe@example.org>
-Architecture: $ARCH
+Architecture: $arch
 Version: $VERSION
 Version: $VERSION
-Filename: pool/main/${NAME}/${NAME}_${VERSION}_${ARCH}.deb" >> $FILE
-		test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
-		echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
+Filename: pool/main/${NAME}/${NAME}_${VERSION}_${arch}.deb" >> $FILE
+			test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
+			echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
  If you find such a package installed on your system,
  If you find such a package installed on your system,
  YOU did something horribly wrong! They are autogenerated
  YOU did something horribly wrong! They are autogenerated
  und used only by testcases for APT and surf no other propose…
  und used only by testcases for APT and surf no other propose…
 " >> $FILE
 " >> $FILE
+		done
 	done
 	done
 }
 }
 
 
@@ -427,21 +433,24 @@ insertinstalledpackage() {
 	local ARCH="$2"
 	local ARCH="$2"
 	local VERSION="$3"
 	local VERSION="$3"
 	local DEPENDENCIES="$4"
 	local DEPENDENCIES="$4"
+	local PRIORITY="${5:-optional}"
 	local FILE="rootdir/var/lib/dpkg/status"
 	local FILE="rootdir/var/lib/dpkg/status"
-	echo "Package: $NAME
+	for arch in $(echo "$ARCH" | sed -e 's#,#\n#g'); do
+		echo "Package: $NAME
 Status: install ok installed
 Status: install ok installed
-Priority: optional
+Priority: $PRIORITY
 Section: other
 Section: other
 Installed-Size: 42
 Installed-Size: 42
 Maintainer: Joe Sixpack <joe@example.org>
 Maintainer: Joe Sixpack <joe@example.org>
-Architecture: $ARCH
+Architecture: $arch
 Version: $VERSION" >> $FILE
 Version: $VERSION" >> $FILE
-	test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
-	echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
+		test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
+		echo "Description: an autogenerated dummy ${NAME}=${VERSION}/installed
  If you find such a package installed on your system,
  If you find such a package installed on your system,
  YOU did something horribly wrong! They are autogenerated
  YOU did something horribly wrong! They are autogenerated
  und used only by testcases for APT and surf no other propose…
  und used only by testcases for APT and surf no other propose…
 " >> $FILE
 " >> $FILE
+	done
 }
 }