aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorrubo77 <github@r.z11.de>2018-07-11 12:29:12 +0200
committerrubo77 <github@r.z11.de>2018-07-11 19:29:30 +0200
commitebeab61591564200bf58d5a4e0143f6e7262bc39 (patch)
treea6bcc9010a34caf46aa177b36e38ec4e5a24b3ef /tests
parent3d3a9d874956be60675bad875b8cd027197b0e6d (diff)
validate.sh shows found packages folder now
Diffstat (limited to 'tests')
-rwxr-xr-xtests/validate_site.sh15
1 files changed, 9 insertions, 6 deletions
diff --git a/tests/validate_site.sh b/tests/validate_site.sh
index 0a8daeb..381993d 100755
--- a/tests/validate_site.sh
+++ b/tests/validate_site.sh
@@ -61,20 +61,23 @@ cd $testpath/packages/package
echo "####### validating GLUON_SITE_PACKAGES from $P/site.mk ..."
# ignore non-gluon packages and standard gluon features
-sed '/GLUON_RELEASE/,$d' $P/site.mk | egrep -v '(#|G|iwinfo|iptables|haveged|vim|mesh-batman-adv-14|web-advanced|web-wizard)'> $testpath/site.mk.sh
+sed '/GLUON_RELEASE/,$d' $P/site.mk | egrep -v '(#|G|iwinfo|iptables|haveged|vim|socat|mesh-batman-adv-1[45]|web-advanced|web-wizard)'> $testpath/site.mk.sh
sed -i 's/\s\\$//g;/^$/d' $testpath/site.mk.sh
sed -i 's/gluon-mesh-batman-adv-1[45]/gluon-mesh-batman-adv/g' $testpath/site.mk.sh
cat $testpath/site.mk.sh |
while read packet; do
if [ "$packet" != "" ]; then
- echo "check $packet ..."
- if [ "$(find $testpath/packages/ -type d -name "$packet")" '!=' '' ]; then
- : find found something
+ echo -n "# $packet"
+ FOUND="$(find $testpath/packages/ -type d -name "$packet")"
+ if [ "$FOUND" '!=' '' ]; then
+ echo " from $(echo $FOUND|sed 's|'$testpath'/packages||g')"
else
# check again with prefix gluon-
- if [ "$(find $testpath/packages/ -type d -name "gluon-$packet")" '!=' '' ]; then
- : find found something
+ FOUND="$(find $testpath/packages/ -type d -name "gluon-$packet")"
+ if [ "$FOUND" '!=' '' ]; then
+ echo " from $(echo $FOUND|sed 's|'$testpath'/packages||g')"
else
+ echo
echo "ERROR: $packet missing"
exit 1
fi