More OUnit tests added

tests/ocaml/Makefile

@@ -21,19 +21,21 @@ a:
 	$(CDUCE) --compile a.cd
 	$(CDO2ML) c.cdo > c.ml
 	$(CDO2ML) a.cdo > a.ml
-	ocamlfind ocamlc -g -package cduce,oUnit -linkpkg -o $@ c.ml $@.ml $@test.ml
+	ocamlfind $(CAML) -g -package cduce,oUnit -linkpkg -o $@ c.ml $@.ml $@test.ml
 	./$@
 
 .PHONY: cdsdl
 cdsdl:
-	$(CDUCE) --compile cdsdl.cd -I `ocamlfind query sdl`
-	ocamlfind ocamlc -o cdsdl -pp "$(CDO2ML)" -impl cdsdl.cdo -package cduce,sdl -linkpkg
-	./cdsdl
+	$(CAML) -c -I `ocamlfind query sdl` $@.mli
+	$(CDUCE) --compile -I `ocamlfind query sdl` $@.cd
+	$(CDO2ML) $@.cdo > $@.ml
+	ocamlfind $(CAML) -package cduce,sdl,oUnit -linkpkg -o $@ $@.ml $@test.ml
+	./$@
 
 .PHONY: cdmysql
 cdmysql:
 	$(CDUCE) --compile $@.cd -I `ocamlfind query mysql`
-	ocamlfind ocamlc -o $@ -pp "$(CDO2ML)" -impl $@.cdo -package cduce,mysql -linkpkg
+	ocamlfind $(CAML) -o $@ -pp "$(CDO2ML)" -impl $@.cdo -package cduce,mysql -linkpkg
 	./$@
 
 
@@ -49,12 +51,8 @@ cdnum:
 	$(CAML) -c $@.mli
 	$(CDUCE) --compile $@.cd -I `ocamlfind query num`
 	$(CDO2ML) $@.cdo > $@.ml
-	ocamlfind ocamlc -package cduce,num,oUnit -linkpkg -o $@ $@.ml $@test.ml
+	ocamlfind $(CAML) -package cduce,num,oUnit -linkpkg -o $@ $@.ml $@test.ml
 	./$@
-#	$(CAML) -c $@.mli
-#	$(CDUCE) --compile $@.cd -I `ocamlfind query num`
-#	ocamlfind $(CAML) -o $@ -pp "$(CDO2ML)" -impl $@.cdo -package cduce,num -linkpkg
-#	./$@
 
 clean:
 	rm -f *.cmo *.cmx *.o *.cdo *.cmi a.ml c.ml cdnum cdnum.ml eval cdsdl cdmysql a oUnit-*

tests/ocaml/cdsdl.cd

 let sdl_version = string_of (Sdl.version [])
 
-let [] = 
+let sdl_init = Sdl.init [ `true ] [ `EVERYTHING ]
+
+let sdl_quit = Sdl.quit
+
+let sdl_num_drives = Sdlcdrom.get_num_drives []
+
+let sdl_cd_open = Sdlcdrom.cd_open
+
+let [] =
   print [ 'Sdl version' !sdl_version '\n' ];
   Sdl.init [ `true ] [ `EVERYTHING ];
   let n = string_of (Sdlcdrom.get_num_drives []) in