X-Git-Url: https://ocean-lang.org/code/?a=blobdiff_plain;f=csrc%2Foceani-tests.mdc;h=fbc5a2f085e3af5f9ad2b2eaa4a928f24579e9fe;hb=b880d8942e1539875d8209e18bf3d21011220ff8;hp=8f10b89324aa7d7dbee42bdfeff3dac4664ba3bf;hpb=bc126aadf03e4e64710f2ad7d76d1247090219d5;p=ocean

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index 8f10b89..fbc5a2f 100644
--- a/csrc/oceani-tests.mdc
+++ b/csrc/oceani-tests.mdc
@@ -35,6 +35,8 @@ arguments separated from the name by commas.  For each test, there is a section
 
 	oceani_tests :=
 	## test list
+	oceani_valg_tests := $(oceani_tests)
+	## combine test lists
 
 	tests:: oceani_test_suite
 	oceani_test_suite: oceani coverage_oceani
@@ -78,17 +80,13 @@ arguments separated from the name by commas.  For each test, there is a section
 		@for i in coverage/#*.gcda; do mv $$i coverage/$${i##*#}; done
 		@gcov -o coverage oceani.mdc > /dev/null 2> /dev/null
 		@mv *.gcov coverage ; [ -f .gcov ] && mv .gcov coverage || true
-		@[ -n "$$SKIP_COVERAGE_CHECK" ] || awk '/NOTEST/ { next } /^ *[1-9]/ {ran+=1} /^ *###/ {skip+=1} \
-		    END {printf "coverage: %6.2f%%\n", ran * 100 / (ran + skip); \
-		         if (ran < (ran + skip) *0.968) exit(1) }' \
-		        coverage/oceani.mdc.gcov
 		@rm -f .tmp*
 
-		@[ -n "$$SKIP_VALGRIND" ] || for T in $(oceani_tests); do \
+		@[ -n "$$SKIP_VALGRIND" ] || for T in $(oceani_valg_tests); do \
 		    echo -n "Valgrind $$T.. "; \
 		    i="$$IFS"; IFS=,; set $$T; IFS="$$i"; t=$$1; shift; \
-		    if ! valgrind --error-exitcode=1 --log-file=.tmp.valg ./oceani --section "test: $$t" oceani-tests.mdc $${1+"$$@"} \
-		         > /dev/null 2>&1 ; then \
+		    if valgrind --error-exitcode=42 --log-file=.tmp.valg ./oceani --section "test: $$t" oceani-tests.mdc $${1+"$$@"} \
+		         > /dev/null 2>&1 ; [ $$? -eq 42 ] ; then \
 		       echo "FAILED"; cat .tmp.valg; exit 1; fi ; \
 		    if grep 'LEAK SUMMARY' .tmp.valg > /dev/null; then \
 		       echo "valgrind found LEAKS"; cat .tmp.valg ; exit 1 ; fi; \
@@ -96,6 +94,10 @@ arguments separated from the name by commas.  For each test, there is a section
 		       echo "valgrind found memory in use at exit"; cat .tmp.valg ; exit 1 ; fi; \
 		    echo " passed"; \
 		done
+		@[ -n "$$SKIP_COVERAGE_CHECK" ] || awk '/NOTEST/ { next } /^ *[1-9]/ {ran+=1} /^ *###/ {skip+=1} \
+		    END {printf "coverage: %6.2f%%\n", ran * 100 / (ran + skip); \
+		         if (ran < (ran + skip) *0.968) exit(1) }' \
+		        coverage/oceani.mdc.gcov
 
 	coverage_oceani: oceani.c
 		$(CC) $(CFLAGS) --coverage -fprofile-dir=coverage -o coverage_oceani oceani.c $(LDLIBS)
@@ -616,7 +618,7 @@ Time to test if structure declarations and accesses work correctly.
 Test functions.  They don't return anything, so we need to get them to print
 
 ###### test list
-	oceani_tests += functions
+	oceani_tests += functions func_ret_type
 
 ###### test: functions
 
@@ -655,6 +657,34 @@ Test functions.  They don't return anything, so we need to get them to print
 	3  2 . 1 .. done
 	4  3 . 2 .. 1 ... done
 
+###### test: func_ret_type
+
+	func double(n:number):number
+		use n+n
+
+	func answer
+		prefix:string
+		suffix:string
+	return string
+	do
+		use prefix ++ suffix
+
+	func noarg_returns
+	return Boolean
+	do
+		use 22/7 == 3.14159
+
+	func main()
+		for j:=10; then j = j - 3; while j > -5:
+			print answer("dou","ble"), j, "is", double(j)
+
+###### output: func_ret_type
+	double 10 is 20
+	double 7 is 14
+	double 4 is 8
+	double 1 is 2
+	double -2 is -4
+
 ## Test code with syntax errors
 
 Syntax errors aren't handled well yet - the result is almost always a
@@ -685,6 +715,9 @@ separate file first, then run from there.
 	    ./coverage_oceani --section "test: $$t" oceani-tests.mdc > /dev/null 2>&1 ;\
 	done || true
 
+###### combine test lists
+	oceani_valg_tests += $(oceani_failing_tests)
+
 ###### test list
 	oceani_failing_tests := syn1
 	oceani_failing_tests += tokerr
@@ -959,7 +992,15 @@ Test for type errors with functions
 		if test1 == test2:
 			pass
 
+	func test4(a:number):string
+		use a * a
+
+	func test5(a:number):string
+		print a
+
 ###### output: func_err_args
+	.tmp.code:28:14: error: expected string, found none
+	.tmp.code:25:8: error: expected string, found number
 	.tmp.code:15:14: error: insufficient arguments to function.
 	.tmp.code:16:14: error: expected number found string
 	.tmp.code:16:22: error: expected string found number