Fix debian package tests

This commit is contained in:
Sridhar Periyasamy 2016-03-09 02:51:58 +00:00
parent b99e40bfab
commit 1737fa8cbc
4 changed files with 8 additions and 8 deletions

View file

@ -28,7 +28,7 @@
}, },
"debian_dependencies":{ "debian_dependencies":{
"libssl-dev" : {}, "libssl1.0.0" : {},
"clang-3.5" : {}, "clang-3.5" : {},
"libcurl3" : {} "libcurl3" : {}
}, },

View file

@ -28,7 +28,7 @@
}, },
"debian_dependencies":{ "debian_dependencies":{
"libssl-dev" : {}, "libssl1.0.0" : {},
"clang-3.5" : {}, "clang-3.5" : {},
"libcurl3" : {} "libcurl3" : {}
}, },

View file

@ -34,7 +34,6 @@ help(){
while [[ $# > 0 ]]; do while [[ $# > 0 ]]; do
lowerI="$(echo $1 | awk '{print tolower($0)}')" lowerI="$(echo $1 | awk '{print tolower($0)}')"
echo "$lowerI"
case $lowerI in case $lowerI in
-m|--manpages) -m|--manpages)
MANPAGE_DIR=$2 MANPAGE_DIR=$2
@ -64,7 +63,6 @@ while [[ $# > 0 ]]; do
help help
;; ;;
*) *)
echo $lowerI
break break
;; ;;
esac esac
@ -78,6 +76,9 @@ PACKAGE_OUTPUT_DIR=$(dirname "${OUTPUT_DEBIAN_FILE}")
PACKAGE_LAYOUT_DIR="$PACKAGE_OUTPUT_DIR/deb_intermediate" PACKAGE_LAYOUT_DIR="$PACKAGE_OUTPUT_DIR/deb_intermediate"
TEST_STAGE_DIR="$PACKAGE_OUTPUT_DIR/debian_tests" TEST_STAGE_DIR="$PACKAGE_OUTPUT_DIR/debian_tests"
# remove any residual deb files from earlier builds
rm -f "$PACKAGE_OUTPUT_DIR/*.deb"
execute_build(){ execute_build(){
create_empty_debian_layout create_empty_debian_layout
copy_files_to_debian_layout copy_files_to_debian_layout
@ -165,8 +166,8 @@ run_e2e_test(){
execute_build execute_build
rm -f "$OUTPUT_DEBIAN_FILE"
DEBIAN_FILE=$(find $PACKAGE_OUTPUT_DIR -iname "*.deb") DEBIAN_FILE=$(find $PACKAGE_OUTPUT_DIR -iname "*.deb")
mv -f "$DEBIAN_FILE" "$OUTPUT_DEBIAN_FILE"
execute_test execute_test
mv -f "$DEBIAN_FILE" "$OUTPUT_DEBIAN_FILE"

View file

@ -51,7 +51,7 @@ delete_last_version(){
rm -f "$DIR/last_version.deb" rm -f "$DIR/last_version.deb"
} }
cleanup(){ teardown(){
delete_last_version delete_last_version
} }
@ -76,6 +76,5 @@ cleanup(){
remove_package remove_package
install_package install_package
purge_package purge_package
cleanup
fi fi
} }