Explorar el Código

- output also the number of the actual test
- test 6 checks uses now also '-C'


git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3295 689a6050-402a-0410-94f2-e92a70836424

Henning Westerholt hace 18 años
padre
commit
cbc392bc0d
Se han modificado 2 ficheros con 6 adiciones y 3 borrados
  1. 5 2
      test/unit/6.sh
  2. 1 1
      test/unit/Makefile

+ 5 - 2
test/unit/6.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 #!/bin/bash
-# checks a configuration with 'openser -c'
+# checks a configuration with 'openser -c' and 'openser -C'
 
 
 CFG=2.cfg
 CFG=2.cfg
 
 
@@ -7,6 +7,9 @@ CFG=2.cfg
 ../openser -c -f $CFG > /dev/null 2>&1
 ../openser -c -f $CFG > /dev/null 2>&1
 ret=$?
 ret=$?
 
 
-sleep 1
+if [ "$ret" -eq 0 ] ; then
+	../openser -C -f $CFG > /dev/null 2>&1
+	ret=$?
+fi ;
 
 
 exit $ret
 exit $ret

+ 1 - 1
test/unit/Makefile

@@ -2,7 +2,7 @@ all:
 	-@for FILE in $(wildcard *.sh) ; do \
 	-@for FILE in $(wildcard *.sh) ; do \
 		if [ -f $$FILE ] ; then \
 		if [ -f $$FILE ] ; then \
 			if [ -x $$FILE ] ; then \
 			if [ -x $$FILE ] ; then \
-				echo "run test:" `head "$$FILE" -n 2 | tail -n 1 | cut -c 3-` ; \
+				echo "run test `basename $$FILE .sh`:" `head "$$FILE" -n 2 | tail -n 1 | cut -c 3-` ; \
 				./$$FILE ; \
 				./$$FILE ; \
 				ret=$$? ; \
 				ret=$$? ; \
 					if [ "$$ret" -eq 0 ] ; then \
 					if [ "$$ret" -eq 0 ] ; then \