commit 5b9e5cfff68eabe36b48e701a87652a196308f9b parent 1f3f8c6661e954249d1bcd94820453f0b3753abd Author: Kyle Milz <kyle@0x30.net> Date: Sat, 20 Aug 2016 00:59:30 -0600 test: update Diffstat:
M | test/package.sh | | | 48 | ++++++++++++++++++++++++++++++++++-------------- |
1 file changed, 34 insertions(+), 14 deletions(-)
diff --git a/test/package.sh b/test/package.sh @@ -1,28 +1,33 @@ # exports TEST_TOOLS and puts us in a temporary directory. . test/utils.sh -function pkg_instrument -{ - port="/usr/ports/${1}" - wrkdist=`make -C $port show=WRKDIST` +# $1 is passed in by the source ('.') statements in the tests. +port="/usr/ports/${1}" +wrkdist=`make -C $port show=WRKDIST` - export TEST_PORT="$port" - export TEST_WRKDIST="$wrkdist" +export TEST_PORT="$port" +export TEST_WRKDIST="$wrkdist" - make -C $port full-build-depends > deps - make -C $port full-test-depends >> deps +function pkg_check_deps +{ + make -C $TEST_PORT full-build-depends > deps + make -C $TEST_PORT full-test-depends >> deps sort deps | uniq > deps.uniq pkg_info -q > installed comm -2 -3 deps.uniq installed > deps_needed - diff -u /dev/null deps_needed + test_diff ${1} "build and test dependencies" /dev/null deps_needed +} - echo ok 2 - build and test dependencies installed +function pkg_build +{ + make -C $TEST_PORT PORTPATH="$TEST_TOOLS:\${WRKDIR}/bin:$PATH" build + test_ret ${1} "instrumented build exit code" $? +} - make -C $port clean=all - make -C $port PORTPATH="$TEST_TOOLS:\${WRKDIR}/bin:$PATH" build - echo ok 3 - instrumented build - #make -C $port PORTPATH="$TEST_TOOLS:\${WRKDIR}/bin:$PATH" test || true +function pkg_test +{ + #make -C $TEST_PORT PORTPATH="$TEST_TOOLS:\${WRKDIR}/bin:$PATH" test || true } function pkg_check @@ -34,4 +39,19 @@ function pkg_check function pkg_clean { make -C $TEST_PORT clean=all + test_ret ${1} "clean exit code" $? +} + +function test_ret +{ + test_num=${1} + test_desc="${2}" + int=${3} + + if [ $int -eq 0 ]; then + echo ok $test_num - $test_desc + else + echo not ok $test_num - $test_desc + echo === got $int, expected 0 + fi }