clean

test/build.sh

@@ -1,4 +1,8 @@
 #!/bin/sh
-#sudo docker.io build -t openldap-test .
-sudo docker.io build --no-cache=true -t openldap-test .
+
+dir=$(dirname $0)
+. $dir/tools/config.prop
+
+sudo docker.io build -t $openldapTestImage .
+#sudo docker.io build --no-cache=true -t openldap-test .
 

test/run-simple.sh

@@ -1,7 +1,10 @@
 #!/bin/sh
 
-docker.io run --name openldap-test-container -p 65389:389 -d openldap-test
+dir=$(dirname $0)
+. $dir/tools/config.prop
+
+docker.io run --name $openldapTestContainer -p 65389:389 -d $openldapTestImage
 sleep 5
 ldapsearch -x -h localhost -p 65389 -b dc=example,dc=com
 
-$(pwd)/test/tools/delete-container.sh
+$dir/tools/delete-container.sh

test/run-tls.sh

@@ -1,8 +1,11 @@
 #!/bin/sh
 
-docker.io run  --name openldap-test-container --dns=127.0.0.1 -v `pwd`/test/ssl:/etc/ldap/ssl -p 65389:389 -d openldap-test
+dir=$(dirname $0)
+. $dir/tools/config.prop
 
-cert=$(echo `pwd`/test/ssl/ldap.crt)
+docker.io run  --name $openldapTestContainer --dns=127.0.0.1 -v `pwd`/test/ssl:/etc/ldap/ssl -p 65389:389 -d $openldapTestImage
+
+cert=$(echo $dir/ssl/ldap.crt)
 certCN=$(openssl x509 -in $cert -subject -noout | sed -n 's/.*CN=\(.*\)\/*\(.*\)/\1/p')
 addLine=$(echo "127.0.0.1" $certCN)
 
@@ -18,4 +21,4 @@ sed -i '/'"$addLine"'/d' /etc/hosts
 cp /etc/ldap/ldap.conf.old /etc/ldap/ldap.conf
 rm /etc/ldap/ldap.conf.old
 
-$(pwd)/test/tools/delete-container.sh
+$dir/tools/delete-container.sh

test/tools/config.prop

@@ -0,0 +1,2 @@
+openldapTestImage=openldap-test
+openldapTestContainer=openldap-test-container

test/tools/delete-container.sh

@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# remove openldap test container
-docker.io ps -a > testcontainer.out
+. $(dirname $0)/config.prop
 
-if [ "$(grep -c "openldap-test-container" ./testcontainer.out)" -ne 0 ]; then
+# remove openldap test container
+res=$(docker.io ps -a | grep -c "$openldapTestContainer")
+
+if [ $res -ne 0 ]; then
   docker.io stop openldap-test-container
   docker.io rm openldap-test-container
 fi
-
-rm testcontainer.out

test/tools/delete-image.sh

@@ -1,10 +1,10 @@
 #!/bin/sh
 
-# remove openldap test image
-docker.io images > testimage.out
+. $(dirname $0)/config.prop
 
-if [ "$(grep -c "openldap-test" ./testimage.out)" -ne 0 ]; then
+# remove openldap test image
+res=$(docker.io images | grep -c "$openldapTestImage")
+
+if [ $res -ne 0 ]; then
   docker.io rmi openldap-test
 fi
-
-rm testimage.out

test/tools/end.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-./test/tools/delete-container.sh
-./test/tools/delete-image.sh
+$(dirname $0)/delete-container.sh
+$(dirname $0)/delete-image.sh

test/tools/prepare.sh

@@ -1,3 +1,4 @@
 #!/bin/sh
 
-./test/tools/delete-container.sh
+$(dirname $0)/delete-container.sh
+$(dirname $0)/delete-image.sh