Tests moved to 'lib-scanf-2'

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9589 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

5 files changed, 28 insertions, 2 deletions

diff --git a/testsuite/tests/lib-scanf-2/Makefile b/testsuite/tests/lib-scanf-2/Makefile
new file mode 100644
index 0000000000..eb7eb2ba1e
--- /dev/null
+++ b/testsuite/tests/lib-scanf-2/Makefile
@@ -0,0 +1,21 @@
+default: compile run
+
+compile: tscanf2_io.cmo tscanf2_io.cmx
+	@$(OCAMLC) unix.cma tscanf2_io.cmo -o master.bytecode tscanf2_master.ml
+	@$(OCAMLC) tscanf2_io.cmo -o slave.bytecode tscanf2_slave.ml
+	@$(OCAMLOPT) unix.cmxa tscanf2_io.cmx -o master.native tscanf2_master.ml
+	@$(OCAMLOPT) tscanf2_io.cmx -o slave.native tscanf2_slave.ml
+
+run:
+	@echo -n " ... testing with ocamlc"
+	@./master.bytecode ./slave.bytecode > result.bytecode 2>&1
+	@diff -q reference result.bytecode > /dev/null || (echo " => failed" && exit 1)
+	@echo -n " ocamlopt"
+	@./master.native ./slave.native > result.native 2>&1
+	@diff -q reference result.native > /dev/null || (echo " => failed" && exit 1)
+	@echo " => passed"
+
+clean: defaultclean
+	@rm -f master.* slave.* result.*
+
+include ../../makefiles/Makefile.common
diff --git a/testsuite/tests/lib-scanf-2/reference b/testsuite/tests/lib-scanf-2/reference
new file mode 100644
index 0000000000..4b8d53fce4
--- /dev/null
+++ b/testsuite/tests/lib-scanf-2/reference
@@ -0,0 +1,2 @@
+ Ping-pong Ping-pong Ping-pong Ping-pong Ping-pong Ping-pong Ping-pong Ping-pong!
+Test OK.
diff --git a/test/Moretest/tscanf2_io.ml b/testsuite/tests/lib-scanf-2/tscanf2_io.ml
index 03997897f8..03997897f8 100644
--- a/test/Moretest/tscanf2_io.ml
+++ b/testsuite/tests/lib-scanf-2/tscanf2_io.ml
diff --git a/test/Moretest/tscanf2_master.ml b/testsuite/tests/lib-scanf-2/tscanf2_master.ml
index 757804ef9d..2dd91bc0c8 100644
--- a/test/Moretest/tscanf2_master.ml
+++ b/testsuite/tests/lib-scanf-2/tscanf2_master.ml
@@ -30,8 +30,11 @@ let interact i =
 ;;
 
 begin
+(*
   Random.self_init ();
   let n = max (Random.int 8) 1 in
+*)
+  let n = 8 in
   let rec loop i =
     if i > 0 then (interact i; loop (i - 1)) in
   loop n
@@ -42,7 +45,7 @@ begin
   send_string_stop ob;
   let ack = receive_string ib in
   if ack = "OK, bye!"
-  then (prerr_endline "Test OK."; exit 0)
-  else (prerr_endline "Test Failed!"; exit 2)
+  then (print_endline "Test OK."; exit 0)
+  else (print_endline "Test Failed!"; exit 2)
 end
 ;;
diff --git a/test/Moretest/tscanf2_slave.ml b/testsuite/tests/lib-scanf-2/tscanf2_slave.ml
index e06a81f814..e06a81f814 100644
--- a/test/Moretest/tscanf2_slave.ml
+++ b/testsuite/tests/lib-scanf-2/tscanf2_slave.ml