From 940c5afc4fc66c3774ab941355f4486d72bd82c9 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Wed, 18 Jun 2014 09:31:50 +0200 Subject: [PATCH] new tests --- test.sh | 8 ++++---- test/tools/run.sh | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test.sh b/test.sh index 06b5bb9..bff84aa 100755 --- a/test.sh +++ b/test.sh @@ -6,10 +6,10 @@ . test/tools/run.sh -run_test tools/build-container "Successfully built" -run_test simple "dn: dc=example,dc=com" -run_test tls "dn: dc=example,dc=com" -run_test db "dn: dc=otherdomain,dc=com" +run_test tools/build-container.sh "Successfully built" +run_test simple.sh "dn: dc=example,dc=com" +run_test tls.sh "dn: dc=example,dc=com" +run_test db.sh "dn: dc=otherdomain,dc=com" . test/tools/end.sh diff --git a/test/tools/run.sh b/test/tools/run.sh index 653ccd8..2618eeb 100755 --- a/test/tools/run.sh +++ b/test/tools/run.sh @@ -23,21 +23,21 @@ echo_ok () { } run_test () { - fction=$1 + test=$1 out=test/test.out - echo_start $fction + echo_start $test if [ -z ${verbose} ]; then - ./test/$1.sh > $out 2>&1 + ./test/$test > $out 2>&1 else - ./test/$1.sh | tee $out 2>&1 + ./test/$test | tee $out 2>&1 fi if [ "$(grep -c "$2" $out)" -eq 0 ]; then - echo_error $fction + echo_error $test else - echo_ok $fction + echo_ok $test fi rm $out