make test will now run both oUnit and qtest

Makefile

@@ -62,12 +62,14 @@ QTESTABLE=$(filter-out $(DONTTEST), \
 qtest-clean:
 	@rm -rf qtest/
 
-qtest: qtest-clean build
+qtest-build: qtest-clean build
 	@mkdir -p qtest
 	@qtest extract -o qtest/qtest_all.ml $(QTESTABLE) 2> /dev/null
 	@ocamlbuild $(OPTIONS) -pkg oUnit,QTest2Lib \
 		-I core -I misc -I string \
 		qtest/qtest_all.native
+
+qtest: qtest-build
 	@echo 
 	./qtest_all.native
 
@@ -79,7 +81,11 @@ push-stable: all
 	git push origin
 	git checkout master
 
-test-all: test qtest
+run-test: build qtest-build
+	./qtest_all.native
+	./run_tests.native
+
+test-all: run-test qtest
 
 tags:
 	otags *.ml *.mli

_oasis

@@ -179,7 +179,7 @@ Executable test_threads
   BuildDepends: containers,threads,oUnit,containers.lwt
 
 Test all
-  Command: $run_tests
+  Command: make test-all
   TestTools: run_tests
   Run$: flag(tests)