summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Clerc <xavier.clerc@inria.fr>2010-01-25 13:54:39 +0000
committerXavier Clerc <xavier.clerc@inria.fr>2010-01-25 13:54:39 +0000
commitc7880cef2f3f4648019d3fe63128976a97aef6cc (patch)
tree2a455c9459717cc58ecd8df4765080f87cd0ce29
parent1cba969d52b8bcc83e7f5ca35ec6e1beae39d3eb (diff)
Tests moved to 'basic'
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9564 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--testsuite/tests/basic/Makefile2
-rw-r--r--testsuite/tests/basic/arrays.ml (renamed from test/Moretest/arrays.ml)0
-rw-r--r--testsuite/tests/basic/arrays.reference (renamed from testsuite/tests/.gitignore)0
-rw-r--r--testsuite/tests/basic/boxedints.ml (renamed from test/Moretest/boxedints.ml)0
-rw-r--r--testsuite/tests/basic/boxedints.reference122
-rw-r--r--testsuite/tests/basic/equality.ml (renamed from test/Moretest/equality.ml)4
-rw-r--r--testsuite/tests/basic/equality.reference43
-rw-r--r--testsuite/tests/basic/float.ml (renamed from test/Moretest/float.ml)0
-rw-r--r--testsuite/tests/basic/float.reference1
-rw-r--r--testsuite/tests/basic/includestruct.ml (renamed from test/Moretest/includestruct.ml)0
-rw-r--r--testsuite/tests/basic/includestruct.reference15
-rw-r--r--testsuite/tests/basic/patmatch.ml (renamed from test/Moretest/patmatch.ml)1
-rw-r--r--testsuite/tests/basic/patmatch.reference68
-rw-r--r--testsuite/tests/basic/recvalues.ml (renamed from test/Moretest/recvalues.ml)0
-rw-r--r--testsuite/tests/basic/recvalues.reference5
-rw-r--r--testsuite/tests/basic/sets.ml (renamed from test/Moretest/sets.ml)2
-rw-r--r--testsuite/tests/basic/sets.reference25
-rw-r--r--testsuite/tests/basic/tailcalls.ml (renamed from test/Moretest/tailcalls.ml)0
-rw-r--r--testsuite/tests/basic/tailcalls.reference5
19 files changed, 290 insertions, 3 deletions
diff --git a/testsuite/tests/basic/Makefile b/testsuite/tests/basic/Makefile
new file mode 100644
index 000000000..a226dd11f
--- /dev/null
+++ b/testsuite/tests/basic/Makefile
@@ -0,0 +1,2 @@
+include ../../makefiles/Makefile.several
+include ../../makefiles/Makefile.common
diff --git a/test/Moretest/arrays.ml b/testsuite/tests/basic/arrays.ml
index bbe8be327..bbe8be327 100644
--- a/test/Moretest/arrays.ml
+++ b/testsuite/tests/basic/arrays.ml
diff --git a/testsuite/tests/.gitignore b/testsuite/tests/basic/arrays.reference
index e69de29bb..e69de29bb 100644
--- a/testsuite/tests/.gitignore
+++ b/testsuite/tests/basic/arrays.reference
diff --git a/test/Moretest/boxedints.ml b/testsuite/tests/basic/boxedints.ml
index ed97513e7..ed97513e7 100644
--- a/test/Moretest/boxedints.ml
+++ b/testsuite/tests/basic/boxedints.ml
diff --git a/testsuite/tests/basic/boxedints.reference b/testsuite/tests/basic/boxedints.reference
new file mode 100644
index 000000000..6a84d3f27
--- /dev/null
+++ b/testsuite/tests/basic/boxedints.reference
@@ -0,0 +1,122 @@
+
+-------- Int32 --------
+
+of_int, to_int
+ 1... 2... 3... 4... 5...
+of_string
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11...
+to_string, format
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11... 12... 13... 14... 15... 16... 17... 18...
+neg
+ 1... 2... 3... 4... 5... 6...
+add
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11... 12... 13...
+sub
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11... 12...
+mul
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11... 12... 13...
+div
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11...
+mod
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11...
+and
+ 1... 2... 3... 4... 5...
+or
+ 1... 2... 3... 4... 5...
+xor
+ 1... 2... 3... 4... 5...
+shift_left
+ 1... 2... 3... 4... 5... 6... 7... 8...
+shift_right
+ 1... 2... 3... 4... 5... 6... 7...
+shift_right_logical
+ 1... 2... 3... 4... 5... 6... 7...
+of_float
+ 1... 2... 3... 4... 5... 6... 7...
+to_float
+ 1... 2... 3... 4... 5...
+Comparisons
+ 1... 2... 3... 4... 5... 6... 7...
+
+-------- Int64 --------
+
+of_int, to_int
+ 1... 2... 3... 4... 5...
+of_string
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11...
+to_string, format
+ 1... 2... 3... 4... 5... 6... 7... 7... 8... 9... 10... 11... 12... 13... 14... 15... 16... 17... 18...
+neg
+ 1... 2... 3... 4... 5... 6...
+add
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11... 12... 13...
+sub
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11... 12...
+mul
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11... 12... 13...
+div
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11...
+mod
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11...
+and
+ 1... 2... 3... 4... 5...
+or
+ 1... 2... 3... 4... 5...
+xor
+ 1... 2... 3... 4... 5...
+shift_left
+ 1... 2... 3... 4... 5... 6... 7... 8...
+shift_right
+ 1... 2... 3... 4... 5... 6... 7...
+shift_right_logical
+ 1... 2... 3... 4... 5... 6... 7...
+Comparisons
+ 1... 2... 3... 4... 5... 6... 7...
+
+-------- Nativeint --------
+
+of_int, to_int
+ 1... 2... 3... 4... 5...
+of_string
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11...
+to_string, format
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11... 12... 13... 14... 15... 16... 17... 18...
+neg
+ 1... 2... 3... 4... 5... 6...
+add
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11... 12... 13...
+sub
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11... 12...
+mul
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11... 12... 13...
+div
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11...
+mod
+ 1... 2... 3... 4... 5... 6... 7... 8... 9... 10... 11...
+and
+ 1... 2... 3... 4... 5...
+or
+ 1... 2... 3... 4... 5...
+xor
+ 1... 2... 3... 4... 5...
+shift_left
+ 1... 2... 3... 4... 5... 6... 7... 8...
+shift_right
+ 1... 2... 3... 4... 5... 6... 7...
+shift_right_logical
+ 1... 2... 3... 4... 5... 6... 7...
+of_float
+ 1... 2... 3... 4... 5... 6... 7...
+to_float
+ 1... 2... 3... 4... 5...
+Comparisons
+ 1... 2... 3... 4... 5... 6... 7...
+
+--------- Conversions -----------
+
+nativeint of/to int32
+ 1... 2...
+int64 of/to int32
+ 1... 2... 3...
+int64 of/to nativeint
+ 1... 2... 3...
diff --git a/test/Moretest/equality.ml b/testsuite/tests/basic/equality.ml
index ad6cb5ff5..133a3fe1a 100644
--- a/test/Moretest/equality.ml
+++ b/testsuite/tests/basic/equality.ml
@@ -1,6 +1,6 @@
let test n check res =
- prerr_string "Test "; prerr_int n;
- if check res then prerr_string " passed.\n" else prerr_string " FAILED.\n";
+ print_string "Test "; print_int n;
+ if check res then print_string " passed.\n" else print_string " FAILED.\n";
flush stderr
let eq0 = function 0 -> true | _ -> false
diff --git a/testsuite/tests/basic/equality.reference b/testsuite/tests/basic/equality.reference
new file mode 100644
index 000000000..1d5f14011
--- /dev/null
+++ b/testsuite/tests/basic/equality.reference
@@ -0,0 +1,43 @@
+Test 1 passed.
+Test 2 passed.
+Test 3 passed.
+Test 4 passed.
+Test 5 passed.
+Test 6 passed.
+Test 7 passed.
+Test 8 passed.
+Test 9 passed.
+Test 10 passed.
+Test 11 passed.
+Test 12 passed.
+Test 13 passed.
+Test 14 passed.
+Test 15 passed.
+Test 16 passed.
+Test 17 passed.
+Test 18 passed.
+Test 19 passed.
+Test 20 passed.
+Test 21 passed.
+Test 22 passed.
+Test 23 passed.
+Test 24 passed.
+Test 25 passed.
+Test 26 passed.
+Test 27 passed.
+Test 28 passed.
+Test 29 passed.
+Test 30 passed.
+Test 31 passed.
+Test 32 passed.
+Test 33 passed.
+Test 34 passed.
+Test 35 passed.
+Test 36 passed.
+Test 37 passed.
+Test 38 passed.
+Test 39 passed.
+Test 40 passed.
+Test 41 passed.
+Test 42 passed.
+Test 43 passed.
diff --git a/test/Moretest/float.ml b/testsuite/tests/basic/float.ml
index 9ebabbc4b..9ebabbc4b 100644
--- a/test/Moretest/float.ml
+++ b/testsuite/tests/basic/float.ml
diff --git a/testsuite/tests/basic/float.reference b/testsuite/tests/basic/float.reference
new file mode 100644
index 000000000..3e7bab44d
--- /dev/null
+++ b/testsuite/tests/basic/float.reference
@@ -0,0 +1 @@
+1./.0. = inf
diff --git a/test/Moretest/includestruct.ml b/testsuite/tests/basic/includestruct.ml
index 182272c1b..182272c1b 100644
--- a/test/Moretest/includestruct.ml
+++ b/testsuite/tests/basic/includestruct.ml
diff --git a/testsuite/tests/basic/includestruct.reference b/testsuite/tests/basic/includestruct.reference
new file mode 100644
index 000000000..a7756837e
--- /dev/null
+++ b/testsuite/tests/basic/includestruct.reference
@@ -0,0 +1,15 @@
+1, 2
+2, 3
+124, 457
+0
+2
+2
+1
+3
+F is called
+A
+42
+A
+42
+foo1
+foo1
diff --git a/test/Moretest/patmatch.ml b/testsuite/tests/basic/patmatch.ml
index 0077e775a..3101f3335 100644
--- a/test/Moretest/patmatch.ml
+++ b/testsuite/tests/basic/patmatch.ml
@@ -45,6 +45,7 @@ let l = function
| [|x|] -> x + 1
| [|x;y|] -> x + y
| [|x;y;z|] -> x + y + z
+ | _ -> assert false
(* The test *)
diff --git a/testsuite/tests/basic/patmatch.reference b/testsuite/tests/basic/patmatch.reference
new file mode 100644
index 000000000..7a35b1307
--- /dev/null
+++ b/testsuite/tests/basic/patmatch.reference
@@ -0,0 +1,68 @@
+f(-5) = 0
+f(-4) = 0
+f(-3) = 0
+f(-2) = 0
+f(-1) = 0
+f(0) = 0
+f(1) = 1
+f(2) = 2
+f(3) = 3
+f(4) = 4
+f(5) = 5
+f(6) = 6
+f(7) = 0
+f(8) = 0
+f(9) = 0
+f(10) = 0
+g(0) = 0
+g(300) = 0
+g(303) = 1
+g(305) = 0
+g(400) = 0
+g(401) = 2
+g(402) = 0
+g(999) = 0
+iszero(-2) = false
+iszero(-1) = false
+iszero(0) = true
+iszero(1) = false
+iszero(2) = false
+h(a) = a
+h(b) = ?
+h(c) = ?
+h(d) = ?
+h(e) = e
+h(f) = ?
+h(g) = ?
+h(h) = ?
+h(i) = i
+h(j) = ?
+h(k) = ?
+h(l) = ?
+h(m) = ?
+h(n) = ?
+h(o) = o
+h(p) = ?
+h(q) = ?
+h(r) = ?
+h(s) = ?
+h(t) = ?
+h(u) = u
+h(v) = ?
+h(w) = ?
+h(x) = ?
+h(y) = ?
+h(z) = ?
+h({) = ?
+h(|) = ?
+h(}) = ?
+h(~) = ?
+k(\000) = othr k(\001) = othr k(\002) = othr k(\003) = othr k(\004) = othr k(\005) = othr k(\006) = othr k(\007) = othr k(\b) = othr k(\t) = blk k(\n) = blk k(\011) = othr k(\012) = othr k(\r) = blk k(\014) = othr k(\015) = othr k(\016) = othr k(\017) = othr k(\018) = othr k(\019) = othr k(\020) = othr k(\021) = othr k(\022) = othr k(\023) = othr k(\024) = othr k(\025) = othr k(\026) = othr k(\027) = othr k(\028) = othr k(\029) = othr k(\030) = othr k(\031) = othr k( ) = blk k(!) = oper k(") = othr k(#) = oper k($) = oper k(%) = oper k(&) = oper k(\') = othr k(() = othr k()) = othr k(*) = oper k(+) = oper k(,) = othr k(-) = othr k(.) = othr k(/) = oper k(0) = dig k(1) = dig k(2) = dig k(3) = dig k(4) = dig k(5) = dig k(6) = dig k(7) = dig k(8) = dig k(9) = dig k(:) = oper k(;) = othr k(<) = oper k(=) = oper k(>) = oper k(?) = oper k(@) = oper k(A) = letr k(B) = letr k(C) = letr k(D) = letr k(E) = letr k(F) = letr k(G) = letr k(H) = letr k(I) = letr k(J) = letr k(K) = letr k(L) = letr k(M) = letr k(N) = letr k(O) = letr k(P) = letr k(Q) = letr k(R) = letr k(S) = letr k(T) = letr k(U) = letr k(V) = letr k(W) = letr k(X) = letr k(Y) = letr k(Z) = letr k([) = othr k(\\) = oper k(]) = othr k(^) = oper k(_) = othr k(`) = othr k(a) = letr k(b) = letr k(c) = letr k(d) = letr k(e) = letr k(f) = letr k(g) = letr k(h) = letr k(i) = letr k(j) = letr k(k) = letr k(l) = letr k(m) = letr k(n) = letr k(o) = letr k(p) = letr k(q) = letr k(r) = letr k(s) = letr k(t) = letr k(u) = letr k(v) = letr k(w) = letr k(x) = letr k(y) = letr k(z) = letr k({) = othr k(|) = oper k(}) = othr k(~) = oper k(\127) = othr k(\128) = othr k(\129) = othr k(\130) = othr k(\131) = othr k(\132) = othr k(\133) = othr k(\134) = othr k(\135) = othr k(\136) = othr k(\137) = othr k(\138) = othr k(\139) = othr k(\140) = othr k(\141) = othr k(\142) = othr k(\143) = othr k(\144) = othr k(\145) = othr k(\146) = othr k(\147) = othr k(\148) = othr k(\149) = othr k(\150) = othr k(\151) = othr k(\152) = othr k(\153) = othr k(\154) = othr k(\155) = othr k(\156) = othr k(\157) = othr k(\158) = othr k(\159) = othr k( ) = othr k(¡) = othr k(¢) = othr k(£) = othr k(¤) = othr k(¥) = othr k(¦) = othr k(§) = othr k(¨) = othr k(©) = othr k(ª) = othr k(«) = othr k(¬) = othr k(­) = othr k(®) = othr k(¯) = othr k(°) = othr k(±) = othr k(²) = othr k(³) = othr k(´) = othr k(µ) = othr k(¶) = othr k(·) = othr k(¸) = othr k(¹) = othr k(º) = othr k(») = othr k(¼) = othr k(½) = othr k(¾) = othr k(¿) = othr k(À) = letr k(Á) = letr k(Â) = letr k(Ã) = letr k(Ä) = letr k(Å) = letr k(Æ) = letr k(Ç) = letr k(È) = letr k(É) = letr k(Ê) = letr k(Ë) = letr k(Ì) = letr k(Í) = letr k(Î) = letr k(Ï) = letr k(Ð) = letr k(Ñ) = letr k(Ò) = letr k(Ó) = letr k(Ô) = letr k(Õ) = letr k(Ö) = letr k(×) = letr k(Ø) = letr k(Ù) = letr k(Ú) = letr k(Û) = letr k(Ü) = letr k(Ý) = letr k(Þ) = letr k(ß) = letr k(à) = letr k(á) = letr k(â) = letr k(ã) = letr k(ä) = letr k(å) = letr k(æ) = letr k(ç) = letr k(è) = letr k(é) = letr k(ê) = letr k(ë) = letr k(ì) = letr k(í) = letr k(î) = letr k(ï) = letr k(ð) = letr k(ñ) = letr k(ò) = letr k(ó) = letr k(ô) = letr k(õ) = letr k(ö) = letr k(÷) = letr k(ø) = letr k(ù) = letr k(ú) = letr k(û) = letr k(ü) = letr k(ý) = letr k(þ) = letr k(ÿ) = letr
+p([|"hello"|]) = hello
+p([|1.0|]) = 1.000000
+q([|2|]) = 2
+r([|3.0|]) = 3.000000
+l([||]) = 0
+l([|1|]) = 2
+l([|2;3|]) = 5
+l([|4;5;6|]) = 15
diff --git a/test/Moretest/recvalues.ml b/testsuite/tests/basic/recvalues.ml
index c00ced827..c00ced827 100644
--- a/test/Moretest/recvalues.ml
+++ b/testsuite/tests/basic/recvalues.ml
diff --git a/testsuite/tests/basic/recvalues.reference b/testsuite/tests/basic/recvalues.reference
new file mode 100644
index 000000000..ac71fc1da
--- /dev/null
+++ b/testsuite/tests/basic/recvalues.reference
@@ -0,0 +1,5 @@
+Test 1: passed
+Test 2: passed
+Test 3: passed
+foo
+Test 4: passed
diff --git a/test/Moretest/sets.ml b/testsuite/tests/basic/sets.ml
index 983145ee4..379b9e82c 100644
--- a/test/Moretest/sets.ml
+++ b/testsuite/tests/basic/sets.ml
@@ -10,7 +10,7 @@
(* *)
(***********************************************************************)
-(* $Id$ *)
+(* $Id: sets.ml 5183 2002-10-16 09:06:39Z weis $ *)
module IntSet = Set.Make(struct type t = int let compare x y = x-y end)
diff --git a/testsuite/tests/basic/sets.reference b/testsuite/tests/basic/sets.reference
new file mode 100644
index 000000000..2d4ebc246
--- /dev/null
+++ b/testsuite/tests/basic/sets.reference
@@ -0,0 +1,25 @@
+-10 true false
+-9 false false
+-8 false false
+-7 false true
+-6 false false
+-5 false false
+-4 false false
+-3 false true
+-2 true false
+-1 false false
+0 true false
+1 false true
+2 true false
+3 false false
+4 true false
+5 false true
+6 true false
+7 false false
+8 false false
+9 false true
+10 false false
+false
+true
+true
+false
diff --git a/test/Moretest/tailcalls.ml b/testsuite/tests/basic/tailcalls.ml
index 23b735359..23b735359 100644
--- a/test/Moretest/tailcalls.ml
+++ b/testsuite/tests/basic/tailcalls.ml
diff --git a/testsuite/tests/basic/tailcalls.reference b/testsuite/tests/basic/tailcalls.reference
new file mode 100644
index 000000000..0943aba55
--- /dev/null
+++ b/testsuite/tests/basic/tailcalls.reference
@@ -0,0 +1,5 @@
+10000001
+10000001
+10000001
+11
+11