From efe777a86451495dcc9e4a898f9a380f8cb6c162 Mon Sep 17 00:00:00 2001 From: Jeff Bilyk Date: Sat, 11 Dec 2010 23:17:23 +0000 Subject: Revert "apts: more tests" This reverts commit be2dce01aaf55626d85932572a69316b5740a753. --- apts | 69 ++++++++++++++++++++++++++++++++++++++++++++++++----- tests/attr | 3 --- tests/bash | 3 --- tests/bbsuid | 3 --- tests/bc | 3 --- tests/beep | 3 --- tests/cdparanoia | 3 --- tests/dialog | 3 --- tests/dmidecode | 3 --- tests/dpkg | 3 --- tests/dtach | 3 --- tests/fetchmail | 4 ---- tests/gzip | 4 ---- tests/haserl | 9 ------- tests/hypermail | 3 --- tests/iperf | 3 --- tests/ipsec-tools | 16 ------------- tests/iputils | 4 ---- tests/lighttpd | 9 ------- tests/lua-discount | 3 --- tests/mini_httpd | 11 --------- tests/mlmmj | 3 --- tests/newt | 3 --- tests/obexftp | 3 --- tests/quagga | 16 ------------- tests/reiserfsprogs | 5 ---- tests/sqlite | 3 --- tests/squid | 14 ----------- tests/syslinux | 6 ----- tests/transmission | 13 ---------- tests/ucarp | 3 --- 31 files changed, 63 insertions(+), 171 deletions(-) mode change 100644 => 100755 apts delete mode 100644 tests/attr delete mode 100644 tests/bash delete mode 100644 tests/bbsuid delete mode 100644 tests/bc delete mode 100644 tests/beep delete mode 100644 tests/cdparanoia delete mode 100644 tests/dialog delete mode 100644 tests/dmidecode delete mode 100644 tests/dpkg delete mode 100644 tests/dtach delete mode 100644 tests/fetchmail delete mode 100644 tests/gzip delete mode 100644 tests/haserl delete mode 100644 tests/hypermail delete mode 100644 tests/iperf delete mode 100644 tests/ipsec-tools delete mode 100644 tests/iputils delete mode 100644 tests/lighttpd delete mode 100644 tests/lua-discount delete mode 100644 tests/mini_httpd delete mode 100644 tests/mlmmj delete mode 100644 tests/newt delete mode 100644 tests/obexftp delete mode 100644 tests/quagga delete mode 100644 tests/reiserfsprogs delete mode 100644 tests/sqlite delete mode 100644 tests/squid delete mode 100644 tests/syslinux delete mode 100644 tests/transmission delete mode 100644 tests/ucarp diff --git a/apts b/apts old mode 100644 new mode 100755 index da80b1a..e91ca10 --- a/apts +++ b/apts @@ -1,6 +1,63 @@ - apk_add $@ - soft=`cat /proc/sys/kernel/pax/softmode` - echo 1 > /proc/sys/kernel/pax/softmode - valgrind /bin/busybox && - echo $soft >/proc/sys/kernel/pax/softmode - apk_del $@ +#!/bin/sh + +# apts is a testing suite for packages on the Alpine Linux system +# In theory, it will work on any distribution that uses the apk-tools +# package manager +# Author: Jeff Bilyk +# Version History: +# Dec 4 2010 - Initial version +# Dec 11 2010 - Added generic-apk test for cases where there isn't a package test file + +# Get file to output to +program=$0 + +usage() { + echo "Usage: $program outputfile " + exit 1 +} + +# parse opts +while getopts "h" opt; do + case "$opt" in + h) usage;; + help) usage;; + esac +done + +OUTFILE=$1 + +# are there any file arguments +if [ $# -eq 0 ]; then + echo "no outfile specified" + usage +fi + +#remove opts so that package is $@ +shift $(( $OPTIND - 1 )) + +# shift once more +shift + +# if there aren't any args besides outfile test all packages +if [ $# -eq 0 ]; + then totaltests=`ls ./tests/ | wc -w` && echo "All (${totaltests}) packages to be tested" && passedtests="0" && for package in `ls ./tests/`; + do echo "Testing $package apk" && /bin/sh -e ./tests/$package $package >> "$OUTFILE" 2>&1 && echo "$package passed tests" >> "$OUTFILE" && echo "$package passed tests" && passedtests=$((passedtests + 1)); + done && echo "$passedtests of $totaltests passed" && exit 0; +fi + +# If script still running, there's args, so test all specified packages +i=1 +while [ $# -gt 0 ]; do + echo "file number $i: $1" + PACKAGE=$1 + # does testing file exist + test -e ./tests/$PACKAGE + # If no testing file exists then run generic-apk + if [ "$?" == "1" ]; + then echo "Testing file for $PACKAGE does not exist" && /bin/sh -e ./tests/generic-apk $PACKAGE >> "$OUTFILE" 2>&1 && echo "$PACKAGE passed tests" && exit 0; + # if testing file exists, then keep running + else echo "Testing $PACKAGE apk" && /bin/sh -e ./tests/$PACKAGE $PACKAGE >> "$OUTFILE" 2>&1 && echo "$PACKAGE passed tests" && exit 0; + fi + i=$(( $i + 1 )) + shift +done diff --git a/tests/attr b/tests/attr deleted file mode 100644 index aa4ce2d..0000000 --- a/tests/attr +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - getfattr . - apk_del $@ diff --git a/tests/bash b/tests/bash deleted file mode 100644 index 7837a78..0000000 --- a/tests/bash +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - /bin/bash -c "echo hello world" - apk_del $@ diff --git a/tests/bbsuid b/tests/bbsuid deleted file mode 100644 index 518ce86..0000000 --- a/tests/bbsuid +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - su - root -c "whoami" - apk_del $@ diff --git a/tests/bc b/tests/bc deleted file mode 100644 index f669c02..0000000 --- a/tests/bc +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - echo "23*9" | bc - apk_del $@ diff --git a/tests/beep b/tests/beep deleted file mode 100644 index 310c9f6..0000000 --- a/tests/beep +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - beep - apk_del $@ diff --git a/tests/cdparanoia b/tests/cdparanoia deleted file mode 100644 index d8544db..0000000 --- a/tests/cdparanoia +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - $@ -V - apk_del $@ diff --git a/tests/dialog b/tests/dialog deleted file mode 100644 index 77505eb..0000000 --- a/tests/dialog +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - dialog --version - apk_del $@ diff --git a/tests/dmidecode b/tests/dmidecode deleted file mode 100644 index b3bf157..0000000 --- a/tests/dmidecode +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - dmidecode - apk_del $@ diff --git a/tests/dpkg b/tests/dpkg deleted file mode 100644 index 73086b9..0000000 --- a/tests/dpkg +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - dpkg --version - apk_del $@ diff --git a/tests/dtach b/tests/dtach deleted file mode 100644 index 1e7b6ec..0000000 --- a/tests/dtach +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - dtach -n sock cal - apk_del $@ diff --git a/tests/fetchmail b/tests/fetchmail deleted file mode 100644 index cfbe5e0..0000000 --- a/tests/fetchmail +++ /dev/null @@ -1,4 +0,0 @@ - apk_add $@ - fetchmail --version - ! which fetchmailconf - apk_del $@ diff --git a/tests/gzip b/tests/gzip deleted file mode 100644 index 41eb1c4..0000000 --- a/tests/gzip +++ /dev/null @@ -1,4 +0,0 @@ - apk_add $@ - gzip --version | gzip -c | gunzip -c | grep GNU - apk_del $@ - [ `readlink /bin/gzip` = /bin/busybox ] diff --git a/tests/haserl b/tests/haserl deleted file mode 100644 index 91da389..0000000 --- a/tests/haserl +++ /dev/null @@ -1,9 +0,0 @@ - SCRIPT=tmp.haserl - apk_add $@ - echo '#!/usr/bin/haserl --shell=lua' >$SCRIPT - echo '' >>$SCRIPT - echo '<% print"hello world" %>' >>$SCRIPT - chmod +x $SCRIPT - ./$SCRIPT | grep 'hello world' - rm -f $SCRIPT - apk_del $@ diff --git a/tests/hypermail b/tests/hypermail deleted file mode 100644 index f48ce06..0000000 --- a/tests/hypermail +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - echo -e "Message-id: 123\nSubject: test\n\nhello" | hypermail - apk_del $@ diff --git a/tests/iperf b/tests/iperf deleted file mode 100644 index e1c9d3e..0000000 --- a/tests/iperf +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - iperf - apk_del $@ diff --git a/tests/ipsec-tools b/tests/ipsec-tools deleted file mode 100644 index 1168c9c..0000000 --- a/tests/ipsec-tools +++ /dev/null @@ -1,16 +0,0 @@ - apk_add $@ - mkdir -p /etc/racoon - touch /etc/ipsec.conf - touch /etc/racoon/racoon.conf - touch /etc/racoon/psk.txt - chmod 400 /etc/racoon/psk.txt - /etc/init.d/racoon start - sleep 1 - pidof racoon - /etc/init.d/racoon stop - killall racoon - while pidof racoon; do\ - echo -n "." >/dev/tty;\ - sleep 1;\ - done - apk_del $@ diff --git a/tests/iputils b/tests/iputils deleted file mode 100644 index c0a1d9c..0000000 --- a/tests/iputils +++ /dev/null @@ -1,4 +0,0 @@ - apk_add $@ - tracepath localhost - apk_del $@ - [ `readlink /bin/ping` = /bin/busybox ] diff --git a/tests/lighttpd b/tests/lighttpd deleted file mode 100644 index 5671790..0000000 --- a/tests/lighttpd +++ /dev/null @@ -1,9 +0,0 @@ - apk_add $@ - /etc/init.d/$@ start - pidof $@ - /etc/init.d/$@ stop - while pidof $@; do\ - echo -n "." >/dev/tty;\ - sleep 1;\ - done - apk_del $@ diff --git a/tests/lua-discount b/tests/lua-discount deleted file mode 100644 index 766b377..0000000 --- a/tests/lua-discount +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - lua -e 'd = require("discount"); d("foo*bar*")' - apk_del $@ diff --git a/tests/mini_httpd b/tests/mini_httpd deleted file mode 100644 index 61566cd..0000000 --- a/tests/mini_httpd +++ /dev/null @@ -1,11 +0,0 @@ - apk_add $@ - echo "MINI_HTTPD_DOCROOT=`pwd`" >> /etc/conf.d/mini_httpd - /etc/init.d/$@ start - sleep 1 - pidof $@2 - /etc/init.d/$@ stop - while pidof $@; do\ - echo -n "." >/dev/tty;\ - sleep 1;\ - done - apk_del $@ diff --git a/tests/mlmmj b/tests/mlmmj deleted file mode 100644 index 2eaae4b..0000000 --- a/tests/mlmmj +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - mlmmj-list -V - apk_del $@ diff --git a/tests/newt b/tests/newt deleted file mode 100644 index dbf0b0e..0000000 --- a/tests/newt +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - whiptail --help - apk_del $@ diff --git a/tests/obexftp b/tests/obexftp deleted file mode 100644 index f9095d5..0000000 --- a/tests/obexftp +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - obexftp --version - apk_del $@ diff --git a/tests/quagga b/tests/quagga deleted file mode 100644 index 1d65094..0000000 --- a/tests/quagga +++ /dev/null @@ -1,16 +0,0 @@ -INITD=zebra -PROC=$INITD - apk_add $@ - if ! [ test -e /etc/quagga ]; - then mkdir -p /etc/quagga; - fi - touch /etc/quagga/zebra.conf - /etc/init.d/$INITD start - sleep 1 - pidof $PROC - /etc/init.d/$INITD stop - while pidof $PROC; do\ - echo -n "." >/dev/tty;\ - sleep 1;\ - done - apk_del $@ diff --git a/tests/reiserfsprogs b/tests/reiserfsprogs deleted file mode 100644 index f20d008..0000000 --- a/tests/reiserfsprogs +++ /dev/null @@ -1,5 +0,0 @@ - apk_add $@ - dd if=/dev/zero count=67000 of=tmp.img - mkreiserfs -q tmp.img - apk_del $@ - rm -f tmp.img diff --git a/tests/sqlite b/tests/sqlite deleted file mode 100644 index f2212ff..0000000 --- a/tests/sqlite +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - echo .help | sqlite3 - apk_del $@ diff --git a/tests/squid b/tests/squid deleted file mode 100644 index c34a9b6..0000000 --- a/tests/squid +++ /dev/null @@ -1,14 +0,0 @@ - apk_add $@ - if ! [ test -e /etc/squid ]; - then mkdir -p /etc/squid; - fi - echo "visible_hostname test.domain" >> /etc/squid/squid.conf - /etc/init.d/$@ start - pidof squid - /etc/init.d/$@ stop - i=10; while pidof $@; do \ - [ $i -eq 0 ] && exit 1; \ - i=$((i - 1)); \ - sleep 1; \ - done - apk_del $@ diff --git a/tests/syslinux b/tests/syslinux deleted file mode 100644 index 268eece..0000000 --- a/tests/syslinux +++ /dev/null @@ -1,6 +0,0 @@ - apk_add $@ dosfstools - dd if=/dev/zero bs=1024 count=1440 of=tmp.img - mkfs.vfat tmp.img - syslinux tmp.img - apk_del $@ dosfstools - rm -f tmp.img diff --git a/tests/transmission b/tests/transmission deleted file mode 100644 index 1fcd816..0000000 --- a/tests/transmission +++ /dev/null @@ -1,13 +0,0 @@ -INITD=transmission-daemon -PROC=$INITD - apk_add $@ transmission-daemon - /etc/init.d/$INITD start - sleep 1 - pidof $PROC - killall transmission-daemon - /etc/init.d/$INITD zap - while pidof $PROC; do\ - echo -n "." >/dev/tty;\ - sleep 1;\ - done - apk_del $@ transmission-daemon diff --git a/tests/ucarp b/tests/ucarp deleted file mode 100644 index 932b7d5..0000000 --- a/tests/ucarp +++ /dev/null @@ -1,3 +0,0 @@ - apk_add $@ - ucarp --help - apk_del $@ -- cgit v1.2.3