Merge pull request #85 from jsarenik/jasan/tests

Make test scripts executable
spf-tools · Apr 14, 2016 · 8515d3d · 8515d3d
2 parents ac9a67f + 362efbc
commit 8515d3d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/misc/ci-setup.sh b/misc/ci-setup.sh
@@ -30,7 +30,12 @@ dlit() {
   }
 }
 
-dlit dig "http://dl.bintray.com/jsarenik/spf-tools-bin/dig.bz2"
-dlit mksh "http://dl.bintray.com/jsarenik/spf-tools-bin/mksh.bz2"
-dlit ksh "http://dl.bintray.com/jsarenik/spf-tools-bin/ksh.bz2"
-dlit dash "http://dl.bintray.com/jsarenik/spf-tools-bin/dash.bz2"
+KERNELARCH=$(uname -sm)
+if
+  test "$KERNELARCH" = "Linux x86_64"
+then
+  dlit dig "http://dl.bintray.com/jsarenik/spf-tools-bin/dig.bz2"
+  dlit mksh "http://dl.bintray.com/jsarenik/spf-tools-bin/mksh.bz2"
+  dlit ksh "http://dl.bintray.com/jsarenik/spf-tools-bin/ksh.bz2"
+  dlit dash "http://dl.bintray.com/jsarenik/spf-tools-bin/dash.bz2"
+fi
diff --git a/tests/test-shell.sh b/tests/test-shell.sh
@@ -18,18 +18,17 @@
 ##############################################################################
 
 a="/$0"; a=${a%/*}; a=${a#/}; a=${a:-.}; BINDIR=$(cd $a; pwd)
-PATH=$BINDIR/..:$BINDIR/../include:$PATH
-cd $BINDIR
 
-test -n "$DEBUG" && export DEBUG=1 ADD="-x"
+export ADD="-e"
+test -n "$DEBUG" && export DEBUG=1 ADD="${ADD}x"
 
 for MYSH in sh ash pdksh ksh dash mksh bash 
 do
   MYSH=$(which $MYSH 2>/dev/null) || continue
 
   echo =================================
   echo Using $MYSH
-  $MYSH -se $ADD < test-real.sh
+  $BINDIR/test-subdirs.sh $MYSH
 
   echo Testing despf functions...
   $MYSH $ADD $BINDIR/test-unit.sh

diff --git a/tests/test-real.sh → tests/test-subdirs.sh b/tests/test-real.sh → tests/test-subdirs.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 ##############################################################################
 #
 # Copyright 2015 spf-tools team (see AUTHORS)
@@ -16,12 +17,17 @@
 #
 ##############################################################################
 
+a="/$0"; a=${a%/*}; a=${a#/}; a=${a:-.}; BINDIR=$(cd $a; pwd)
+export PATH=$BINDIR/..:$PATH
+cd $BINDIR
+
+RUNSHELL=${1:-"/bin/sh"}
 out=$(mktemp)
 set | grep 'SH_VERSION=' >&2 || true
-for test in $(find . -type d -mindepth 1 -maxdepth 1)
+for test in $(find . -mindepth 1 -maxdepth 1 -type d)
 do
   echo Testing $test
-  $0 $ADD $test/cmd <$test/in >$out
+  $RUNSHELL $ADD $test/cmd <$test/in >$out
   grep -v '^+' $out | diff -u $test/out -
   echo .. $test OK
   rm $out

diff --git a/tests/test-unit.sh b/tests/test-unit.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 ##############################################################################
 #
 # Copyright 2015 spf-tools team (see AUTHORS)
@@ -17,6 +18,7 @@
 ##############################################################################
 
 a="/$0"; a=${a%/*}; a=${a#/}; a=${a:-.}; BINDIR=$(cd $a; pwd)
+export PATH=$BINDIR/../include:$PATH
 tmp=$(mktemp /tmp/spf-test-unit-XXXXXXXXX)
 trap "rm $tmp*" EXIT
 . $BINDIR/../include/despf.inc.sh