diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2011-07-20 09:17:07 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2011-07-20 09:17:07 +0000 |
| commit | c91db736b18c7ed0ec81596b76874f5423d5d331 (patch) | |
| tree | a967edfcd254aa6844c44e81ea33596a82b7bf87 /testsuite/tests | |
| parent | 46d5420ca9c695738f7a0baa527d3591d95f067a (diff) | |
| download | ocaml-c91db736b18c7ed0ec81596b76874f5423d5d331.tar.gz | |
merge changes from 3.12.0 to 3.12.1
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11123 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'testsuite/tests')
103 files changed, 276 insertions, 81 deletions
diff --git a/testsuite/tests/asmcomp/alpha.S b/testsuite/tests/asmcomp/alpha.S index 66bf73f288..d8851065c3 100644 --- a/testsuite/tests/asmcomp/alpha.S +++ b/testsuite/tests/asmcomp/alpha.S @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: alpha.S 2638 1999-11-29 19:04:56Z doligez $ */ +/* $Id$ */ .globl call_gen_code .ent call_gen_code diff --git a/testsuite/tests/asmcomp/amd64.S b/testsuite/tests/asmcomp/amd64.S index bb2dc2b0b6..8df6e2d20d 100644 --- a/testsuite/tests/asmcomp/amd64.S +++ b/testsuite/tests/asmcomp/amd64.S @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: amd64.S 5634 2003-06-30 08:28:48Z xleroy $ */ +/* $Id$ */ #ifdef SYS_macosx #define ALIGN 4 diff --git a/testsuite/tests/asmcomp/arith.cmm b/testsuite/tests/asmcomp/arith.cmm index 77257c3cc2..f4efefdbef 100644 --- a/testsuite/tests/asmcomp/arith.cmm +++ b/testsuite/tests/asmcomp/arith.cmm @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: arith.cmm 3218 2000-06-29 11:45:24Z xleroy $ *) +(* $Id$ *) (* Regression test for arithmetic instructions *) diff --git a/testsuite/tests/asmcomp/arm.S b/testsuite/tests/asmcomp/arm.S index 0697095189..186d706146 100644 --- a/testsuite/tests/asmcomp/arm.S +++ b/testsuite/tests/asmcomp/arm.S @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: arm.S 9212 2009-03-31 09:46:08Z xleroy $ */ +/* $Id$ */ .text diff --git a/testsuite/tests/asmcomp/checkbound.cmm b/testsuite/tests/asmcomp/checkbound.cmm index a1277c95a2..995b74f8a3 100644 --- a/testsuite/tests/asmcomp/checkbound.cmm +++ b/testsuite/tests/asmcomp/checkbound.cmm @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: checkbound.cmm 2553 1999-11-17 18:59:06Z xleroy $ *) +(* $Id$ *) (function "checkbound2" (x: int y: int) (checkbound x y)) diff --git a/testsuite/tests/asmcomp/fib.cmm b/testsuite/tests/asmcomp/fib.cmm index e71a90273e..b7e64d3025 100644 --- a/testsuite/tests/asmcomp/fib.cmm +++ b/testsuite/tests/asmcomp/fib.cmm @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: fib.cmm 2553 1999-11-17 18:59:06Z xleroy $ *) +(* $Id$ *) (function "fib" (n: int) (if (< n 2) diff --git a/testsuite/tests/asmcomp/hppa.S b/testsuite/tests/asmcomp/hppa.S index 31fff9dfa6..2b1ab21c66 100644 --- a/testsuite/tests/asmcomp/hppa.S +++ b/testsuite/tests/asmcomp/hppa.S @@ -10,7 +10,7 @@ ;* * ;********************************************************************* -; $Id: hppa.S 2553 1999-11-17 18:59:06Z xleroy $ +; $Id$ ; Must be preprocessed by cpp #ifdef SYS_hpux diff --git a/testsuite/tests/asmcomp/i386.S b/testsuite/tests/asmcomp/i386.S index 079eca1793..f4b65e57ac 100644 --- a/testsuite/tests/asmcomp/i386.S +++ b/testsuite/tests/asmcomp/i386.S @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: i386.S 2553 1999-11-17 18:59:06Z xleroy $ */ +/* $Id$ */ /* Linux with ELF binaries does not prefix identifiers with _. Linux with a.out binaries, FreeBSD, and NextStep do. */ diff --git a/testsuite/tests/asmcomp/i386nt.asm b/testsuite/tests/asmcomp/i386nt.asm index 0ad5247565..66550eb8b2 100644 --- a/testsuite/tests/asmcomp/i386nt.asm +++ b/testsuite/tests/asmcomp/i386nt.asm @@ -10,7 +10,7 @@ ; ;********************************************************************* -; $Id: i386nt.asm 2553 1999-11-17 18:59:06Z xleroy $ +; $Id$ .386 .MODEL FLAT diff --git a/testsuite/tests/asmcomp/ia64.S b/testsuite/tests/asmcomp/ia64.S index 49de1b1947..51361690b8 100644 --- a/testsuite/tests/asmcomp/ia64.S +++ b/testsuite/tests/asmcomp/ia64.S @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: ia64.S 3573 2001-07-12 12:54:24Z doligez $ */ +/* $Id$ */ #define ST8OFF(a,b,d) st8 [a] = b, d #define LD8OFF(a,b,d) ld8 a = [b], d diff --git a/testsuite/tests/asmcomp/integr.cmm b/testsuite/tests/asmcomp/integr.cmm index 84a01d465f..481dd7587d 100644 --- a/testsuite/tests/asmcomp/integr.cmm +++ b/testsuite/tests/asmcomp/integr.cmm @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: integr.cmm 3218 2000-06-29 11:45:24Z xleroy $ *) +(* $Id$ *) (function "square" (x: float) ( *f x x)) diff --git a/testsuite/tests/asmcomp/lexcmm.mli b/testsuite/tests/asmcomp/lexcmm.mli index 9ebc36b56d..a28a57c520 100644 --- a/testsuite/tests/asmcomp/lexcmm.mli +++ b/testsuite/tests/asmcomp/lexcmm.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: lexcmm.mli 2553 1999-11-17 18:59:06Z xleroy $ *) +(* $Id$ *) val token: Lexing.lexbuf -> Parsecmm.token diff --git a/testsuite/tests/asmcomp/lexcmm.mll b/testsuite/tests/asmcomp/lexcmm.mll index a9d17dd3d5..0e8432e1c8 100644 --- a/testsuite/tests/asmcomp/lexcmm.mll +++ b/testsuite/tests/asmcomp/lexcmm.mll @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: lexcmm.mll 3211 2000-06-25 19:54:50Z xleroy $ *) +(* $Id$ *) { open Parsecmm diff --git a/testsuite/tests/asmcomp/m68k.S b/testsuite/tests/asmcomp/m68k.S index 8905da1bb6..436e65e695 100644 --- a/testsuite/tests/asmcomp/m68k.S +++ b/testsuite/tests/asmcomp/m68k.S @@ -10,7 +10,7 @@ |* * |*********************************************************************** -| $Id: m68k.S 2553 1999-11-17 18:59:06Z xleroy $ +| $Id$ | call_gen_code is used with the following types: | unit -> int diff --git a/testsuite/tests/asmcomp/main.c b/testsuite/tests/asmcomp/main.c index 7f0e7174fd..e45c8c27c3 100644 --- a/testsuite/tests/asmcomp/main.c +++ b/testsuite/tests/asmcomp/main.c @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: main.c 9212 2009-03-31 09:46:08Z xleroy $ */ +/* $Id$ */ #include <stddef.h> #include <stdio.h> diff --git a/testsuite/tests/asmcomp/main.ml b/testsuite/tests/asmcomp/main.ml index 7017c35dce..d6207102ac 100644 --- a/testsuite/tests/asmcomp/main.ml +++ b/testsuite/tests/asmcomp/main.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: main.ml 3229 2000-07-07 14:09:23Z xleroy $ *) +(* $Id$ *) open Clflags diff --git a/testsuite/tests/asmcomp/mainarith.c b/testsuite/tests/asmcomp/mainarith.c index efa48ba0e4..95a923d8b9 100644 --- a/testsuite/tests/asmcomp/mainarith.c +++ b/testsuite/tests/asmcomp/mainarith.c @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: mainarith.c 9212 2009-03-31 09:46:08Z xleroy $ */ +/* $Id$ */ #include <stdio.h> #include <math.h> diff --git a/testsuite/tests/asmcomp/mips.s b/testsuite/tests/asmcomp/mips.s index d8e93565a3..9fe9f94b60 100644 --- a/testsuite/tests/asmcomp/mips.s +++ b/testsuite/tests/asmcomp/mips.s @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: mips.s 2638 1999-11-29 19:04:56Z doligez $ */ +/* $Id$ */ .globl call_gen_code .ent call_gen_code diff --git a/testsuite/tests/asmcomp/parsecmm.mly b/testsuite/tests/asmcomp/parsecmm.mly index 6ed2f8ff5e..79b278b052 100644 --- a/testsuite/tests/asmcomp/parsecmm.mly +++ b/testsuite/tests/asmcomp/parsecmm.mly @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: parsecmm.mly 9212 2009-03-31 09:46:08Z xleroy $ */ +/* $Id$ */ /* A simple parser for C-- */ diff --git a/testsuite/tests/asmcomp/parsecmmaux.ml b/testsuite/tests/asmcomp/parsecmmaux.ml index a87432e4e7..8c46888c6b 100644 --- a/testsuite/tests/asmcomp/parsecmmaux.ml +++ b/testsuite/tests/asmcomp/parsecmmaux.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: parsecmmaux.ml 2553 1999-11-17 18:59:06Z xleroy $ *) +(* $Id$ *) (* Auxiliary functions for parsing *) diff --git a/testsuite/tests/asmcomp/parsecmmaux.mli b/testsuite/tests/asmcomp/parsecmmaux.mli index 941ebcb48f..558996552c 100644 --- a/testsuite/tests/asmcomp/parsecmmaux.mli +++ b/testsuite/tests/asmcomp/parsecmmaux.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: parsecmmaux.mli 2553 1999-11-17 18:59:06Z xleroy $ *) +(* $Id$ *) (* Auxiliary functions for parsing *) diff --git a/testsuite/tests/asmcomp/power-aix.S b/testsuite/tests/asmcomp/power-aix.S index ea15308306..96ed2b92d1 100644 --- a/testsuite/tests/asmcomp/power-aix.S +++ b/testsuite/tests/asmcomp/power-aix.S @@ -10,7 +10,7 @@ #* * #********************************************************************* -# $Id: power-aix.S 3042 2000-04-05 18:30:22Z doligez $ +# $Id$ .csect .text[PR] diff --git a/testsuite/tests/asmcomp/power-elf.S b/testsuite/tests/asmcomp/power-elf.S index c7ddeef768..994a9fa7be 100644 --- a/testsuite/tests/asmcomp/power-elf.S +++ b/testsuite/tests/asmcomp/power-elf.S @@ -10,7 +10,7 @@ /* */ /*********************************************************************/ -/* $Id: power-elf.S 2553 1999-11-17 18:59:06Z xleroy $ */ +/* $Id$ */ /* Save and restore all callee-save registers */ /* GPR 14 at sp+16 ... GPR 31 at sp+84 diff --git a/testsuite/tests/asmcomp/power-rhapsody.S b/testsuite/tests/asmcomp/power-rhapsody.S index a9b8044b8d..b456105862 100644 --- a/testsuite/tests/asmcomp/power-rhapsody.S +++ b/testsuite/tests/asmcomp/power-rhapsody.S @@ -10,7 +10,7 @@ /* */ /*********************************************************************/ -/* $Id: power-rhapsody.S 2553 1999-11-17 18:59:06Z xleroy $ */ +/* $Id$ */ /* Save and restore all callee-save registers */ /* GPR 14 at sp+16 ... GPR 31 at sp+84 diff --git a/testsuite/tests/asmcomp/quicksort.cmm b/testsuite/tests/asmcomp/quicksort.cmm index 043e607f80..4029da8d15 100644 --- a/testsuite/tests/asmcomp/quicksort.cmm +++ b/testsuite/tests/asmcomp/quicksort.cmm @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: quicksort.cmm 3211 2000-06-25 19:54:50Z xleroy $ *) +(* $Id$ *) (function "quicksort" (lo: int hi: int a: addr) (if (< lo hi) diff --git a/testsuite/tests/asmcomp/quicksort2.cmm b/testsuite/tests/asmcomp/quicksort2.cmm index 4d80cd58a7..eae9809a79 100644 --- a/testsuite/tests/asmcomp/quicksort2.cmm +++ b/testsuite/tests/asmcomp/quicksort2.cmm @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: quicksort2.cmm 3218 2000-06-29 11:45:24Z xleroy $ *) +(* $Id$ *) (function "cmp" (i: int j: int) (- i j)) diff --git a/testsuite/tests/asmcomp/soli.cmm b/testsuite/tests/asmcomp/soli.cmm index 4716e4f215..47ce64c0b5 100644 --- a/testsuite/tests/asmcomp/soli.cmm +++ b/testsuite/tests/asmcomp/soli.cmm @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: soli.cmm 5634 2003-06-30 08:28:48Z xleroy $ *) +(* $Id$ *) ("d1": int 0 int 1 "d2": int 1 int 0 diff --git a/testsuite/tests/asmcomp/sparc.S b/testsuite/tests/asmcomp/sparc.S index 54d81c1cc3..9a829e1732 100644 --- a/testsuite/tests/asmcomp/sparc.S +++ b/testsuite/tests/asmcomp/sparc.S @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: sparc.S 2553 1999-11-17 18:59:06Z xleroy $ */ +/* $Id$ */ #ifndef SYS_solaris #define Call_gen_code _call_gen_code diff --git a/testsuite/tests/asmcomp/tagged-fib.cmm b/testsuite/tests/asmcomp/tagged-fib.cmm index 04869792c6..e5e45b0fbf 100644 --- a/testsuite/tests/asmcomp/tagged-fib.cmm +++ b/testsuite/tests/asmcomp/tagged-fib.cmm @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: tagged-fib.cmm 2553 1999-11-17 18:59:06Z xleroy $ *) +(* $Id$ *) (function "fib" (n: int) (if (< n 5) diff --git a/testsuite/tests/asmcomp/tagged-integr.cmm b/testsuite/tests/asmcomp/tagged-integr.cmm index 054c78d7f5..df46813eb9 100644 --- a/testsuite/tests/asmcomp/tagged-integr.cmm +++ b/testsuite/tests/asmcomp/tagged-integr.cmm @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: tagged-integr.cmm 3229 2000-07-07 14:09:23Z xleroy $ *) +(* $Id$ *) ("res_square": skip 8) ("h": skip 8) diff --git a/testsuite/tests/asmcomp/tagged-quicksort.cmm b/testsuite/tests/asmcomp/tagged-quicksort.cmm index 6b74753e8e..b519e5cef9 100644 --- a/testsuite/tests/asmcomp/tagged-quicksort.cmm +++ b/testsuite/tests/asmcomp/tagged-quicksort.cmm @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: tagged-quicksort.cmm 3218 2000-06-29 11:45:24Z xleroy $ *) +(* $Id$ *) (function "quick" (lo: int hi: int a: addr) (if (< lo hi) diff --git a/testsuite/tests/asmcomp/tagged-tak.cmm b/testsuite/tests/asmcomp/tagged-tak.cmm index 5e04b73943..fe9e6eb026 100644 --- a/testsuite/tests/asmcomp/tagged-tak.cmm +++ b/testsuite/tests/asmcomp/tagged-tak.cmm @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: tagged-tak.cmm 3229 2000-07-07 14:09:23Z xleroy $ *) +(* $Id$ *) (function "tak" (x:int y:int z:int) (if (> x y) diff --git a/testsuite/tests/asmcomp/tak.cmm b/testsuite/tests/asmcomp/tak.cmm index de236fc8b8..cd61ec89be 100644 --- a/testsuite/tests/asmcomp/tak.cmm +++ b/testsuite/tests/asmcomp/tak.cmm @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: tak.cmm 3211 2000-06-25 19:54:50Z xleroy $ *) +(* $Id$ *) (function "tak" (x:int y:int z:int) (if (> x y) diff --git a/testsuite/tests/basic-more/tformat.ml b/testsuite/tests/basic-more/tformat.ml index afad529708..d02cb2907a 100644 --- a/testsuite/tests/basic-more/tformat.ml +++ b/testsuite/tests/basic-more/tformat.ml @@ -10,7 +10,7 @@ (* *) (*************************************************************************) -(* $Id: tformat.ml 9270 2009-05-20 11:52:42Z doligez $ +(* $Id$ A testbed file for the module Format. diff --git a/testsuite/tests/basic-private/length.ml b/testsuite/tests/basic-private/length.ml index 945d05d144..318e98cb11 100644 --- a/testsuite/tests/basic-private/length.ml +++ b/testsuite/tests/basic-private/length.ml @@ -1,4 +1,4 @@ -(* $Id: length.ml 8482 2007-11-06 21:06:18Z weis $ +(* $Id$ A testbed file for private type abbreviation definitions. diff --git a/testsuite/tests/basic-private/length.mli b/testsuite/tests/basic-private/length.mli index 2215ec8f77..6cd7e12142 100644 --- a/testsuite/tests/basic-private/length.mli +++ b/testsuite/tests/basic-private/length.mli @@ -1,4 +1,4 @@ -(* $Id: length.mli 8482 2007-11-06 21:06:18Z weis $ +(* $Id$ A testbed file for private type abbreviation definitions. diff --git a/testsuite/tests/basic-private/tlength.ml b/testsuite/tests/basic-private/tlength.ml index a428e20757..f1fd91af94 100644 --- a/testsuite/tests/basic-private/tlength.ml +++ b/testsuite/tests/basic-private/tlength.ml @@ -1,4 +1,4 @@ -(* $Id: tlength.ml 8482 2007-11-06 21:06:18Z weis $ +(* $Id$ A testbed file for private type abbreviation definitions. diff --git a/testsuite/tests/basic/maps.ml b/testsuite/tests/basic/maps.ml index cb0e989b11..c23f2d8c1e 100644 --- a/testsuite/tests/basic/maps.ml +++ b/testsuite/tests/basic/maps.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: sets.ml 5183 2002-10-16 09:06:39Z weis $ *) +(* $Id$ *) module IntMap = Map.Make(struct type t = int let compare x y = x-y end) diff --git a/testsuite/tests/basic/sets.ml b/testsuite/tests/basic/sets.ml index 379b9e82c2..983145ee48 100644 --- a/testsuite/tests/basic/sets.ml +++ b/testsuite/tests/basic/sets.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: sets.ml 5183 2002-10-16 09:06:39Z weis $ *) +(* $Id$ *) module IntSet = Set.Make(struct type t = int let compare x y = x-y end) diff --git a/testsuite/tests/embedded/.svnignore b/testsuite/tests/embedded/.svnignore new file mode 100755 index 0000000000..4394099ffb --- /dev/null +++ b/testsuite/tests/embedded/.svnignore @@ -0,0 +1,10 @@ +#!/bin/sh + +svn propset svn:ignore -F - . <<EOF + +*.result +*.byte +*.native +program + +EOF diff --git a/testsuite/tests/gc-roots/.svnignore b/testsuite/tests/gc-roots/.svnignore new file mode 100755 index 0000000000..4394099ffb --- /dev/null +++ b/testsuite/tests/gc-roots/.svnignore @@ -0,0 +1,10 @@ +#!/bin/sh + +svn propset svn:ignore -F - . <<EOF + +*.result +*.byte +*.native +program + +EOF diff --git a/testsuite/tests/lib-bigarray/fftba.ml b/testsuite/tests/lib-bigarray/fftba.ml index a772876ec0..17465df5c6 100644 --- a/testsuite/tests/lib-bigarray/fftba.ml +++ b/testsuite/tests/lib-bigarray/fftba.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: fftba.ml 2938 2000-03-10 14:54:41Z xleroy $ *) +(* $Id$ *) open Bigarray diff --git a/testsuite/tests/lib-bigarray/pr5115.ml b/testsuite/tests/lib-bigarray/pr5115.ml new file mode 100644 index 0000000000..69cdca64d9 --- /dev/null +++ b/testsuite/tests/lib-bigarray/pr5115.ml @@ -0,0 +1,13 @@ +(* PR#5115 - multiple evaluation of bigarray expr *) + +open Bigarray + +let f y0 = + Printf.printf "***EXEC***\n%!"; + y0 + +let _ = + let y = Array1.of_array float64 fortran_layout [| 1. |] in + (f y).{1}; + (f y).{1} <- 3.14 + diff --git a/testsuite/tests/lib-bigarray/pr5115.reference b/testsuite/tests/lib-bigarray/pr5115.reference new file mode 100644 index 0000000000..63f719ac56 --- /dev/null +++ b/testsuite/tests/lib-bigarray/pr5115.reference @@ -0,0 +1,2 @@ +***EXEC*** +***EXEC*** diff --git a/testsuite/tests/lib-digest/.svnignore b/testsuite/tests/lib-digest/.svnignore new file mode 100755 index 0000000000..4394099ffb --- /dev/null +++ b/testsuite/tests/lib-digest/.svnignore @@ -0,0 +1,10 @@ +#!/bin/sh + +svn propset svn:ignore -F - . <<EOF + +*.result +*.byte +*.native +program + +EOF diff --git a/testsuite/tests/lib-dynlink-bytecode/.svnignore b/testsuite/tests/lib-dynlink-bytecode/.svnignore index 035b305b27..40e950c94c 100644 --- a/testsuite/tests/lib-dynlink-bytecode/.svnignore +++ b/testsuite/tests/lib-dynlink-bytecode/.svnignore @@ -1,3 +1,11 @@ +#!/bin/sh + +svn propset svn:ignore -F - . <<EOF + +*.result +*.byte +*.native +program main static custom @@ -6,3 +14,5 @@ custom *.result *.cm* *.o + +EOF diff --git a/testsuite/tests/lib-dynlink-native/.svnignore b/testsuite/tests/lib-dynlink-native/.svnignore index 1668ef6ad1..16dd896b1b 100644 --- a/testsuite/tests/lib-dynlink-native/.svnignore +++ b/testsuite/tests/lib-dynlink-native/.svnignore @@ -1,3 +1,11 @@ +#!/bin/sh + +svn propset svn:ignore -F - . <<EOF + +*.result +*.byte +*.native +program mypack.pack.s result main @@ -5,3 +13,5 @@ main *.a *.cm* *.o + +EOF diff --git a/testsuite/tests/lib-scanf/tscanf.ml b/testsuite/tests/lib-scanf/tscanf.ml index cab4d7be4d..89b188b461 100644 --- a/testsuite/tests/lib-scanf/tscanf.ml +++ b/testsuite/tests/lib-scanf/tscanf.ml @@ -10,7 +10,7 @@ (* *) (*************************************************************************) -(* $Id: tscanf.ml 9306 2009-07-03 08:36:54Z weis $ +(* $Id$ A testbed file for the module Scanf. diff --git a/testsuite/tests/misc-kb/equations.ml b/testsuite/tests/misc-kb/equations.ml index 3feeada7c7..a7ea9a03b6 100644 --- a/testsuite/tests/misc-kb/equations.ml +++ b/testsuite/tests/misc-kb/equations.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: equations.ml 2553 1999-11-17 18:59:06Z xleroy $ *) +(* $Id$ *) (****************** Equation manipulations *************) diff --git a/testsuite/tests/misc-kb/equations.mli b/testsuite/tests/misc-kb/equations.mli index 665b739ed4..45d790260f 100644 --- a/testsuite/tests/misc-kb/equations.mli +++ b/testsuite/tests/misc-kb/equations.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: equations.mli 2553 1999-11-17 18:59:06Z xleroy $ *) +(* $Id$ *) open Terms diff --git a/testsuite/tests/misc-kb/kb.ml b/testsuite/tests/misc-kb/kb.ml index 1e369bd1b5..590f4cd5d0 100644 --- a/testsuite/tests/misc-kb/kb.ml +++ b/testsuite/tests/misc-kb/kb.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: kb.ml 2553 1999-11-17 18:59:06Z xleroy $ *) +(* $Id$ *) open Terms open Equations diff --git a/testsuite/tests/misc-kb/kb.mli b/testsuite/tests/misc-kb/kb.mli index bd02de4baa..59b60e4ea2 100644 --- a/testsuite/tests/misc-kb/kb.mli +++ b/testsuite/tests/misc-kb/kb.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: kb.mli 2553 1999-11-17 18:59:06Z xleroy $ *) +(* $Id$ *) open Terms open Equations diff --git a/testsuite/tests/misc-kb/kbmain.ml b/testsuite/tests/misc-kb/kbmain.ml index 7d9e5baf19..0a5da2fb63 100644 --- a/testsuite/tests/misc-kb/kbmain.ml +++ b/testsuite/tests/misc-kb/kbmain.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: kbmain.ml 7017 2005-08-12 09:22:04Z xleroy $ *) +(* $Id$ *) open Terms open Equations diff --git a/testsuite/tests/misc-kb/orderings.ml b/testsuite/tests/misc-kb/orderings.ml index 2f3ee97352..11a776ba7c 100644 --- a/testsuite/tests/misc-kb/orderings.ml +++ b/testsuite/tests/misc-kb/orderings.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: orderings.ml 2553 1999-11-17 18:59:06Z xleroy $ *) +(* $Id$ *) (*********************** Recursive Path Ordering ****************************) diff --git a/testsuite/tests/misc-kb/orderings.mli b/testsuite/tests/misc-kb/orderings.mli index b68ceda3d0..d7abfd5645 100644 --- a/testsuite/tests/misc-kb/orderings.mli +++ b/testsuite/tests/misc-kb/orderings.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: orderings.mli 2553 1999-11-17 18:59:06Z xleroy $ *) +(* $Id$ *) open Terms diff --git a/testsuite/tests/misc-kb/terms.ml b/testsuite/tests/misc-kb/terms.ml index 1b182f7561..dba7000646 100644 --- a/testsuite/tests/misc-kb/terms.ml +++ b/testsuite/tests/misc-kb/terms.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: terms.ml 2553 1999-11-17 18:59:06Z xleroy $ *) +(* $Id$ *) (****************** Term manipulations *****************) diff --git a/testsuite/tests/misc-kb/terms.mli b/testsuite/tests/misc-kb/terms.mli index a71e139c63..7d22e9cb00 100644 --- a/testsuite/tests/misc-kb/terms.mli +++ b/testsuite/tests/misc-kb/terms.mli @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: terms.mli 2553 1999-11-17 18:59:06Z xleroy $ *) +(* $Id$ *) type term = Var of int diff --git a/testsuite/tests/misc-unsafe/fft.ml b/testsuite/tests/misc-unsafe/fft.ml index 6a5f4dffb9..0907cdee3c 100644 --- a/testsuite/tests/misc-unsafe/fft.ml +++ b/testsuite/tests/misc-unsafe/fft.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: fft.ml 7017 2005-08-12 09:22:04Z xleroy $ *) +(* $Id$ *) let pi = 3.14159265358979323846 diff --git a/testsuite/tests/misc-unsafe/quicksort.ml b/testsuite/tests/misc-unsafe/quicksort.ml index cfc68068e8..7449488d2d 100644 --- a/testsuite/tests/misc-unsafe/quicksort.ml +++ b/testsuite/tests/misc-unsafe/quicksort.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: quicksort.ml 7017 2005-08-12 09:22:04Z xleroy $ *) +(* $Id$ *) (* Good test for loops. Best compiled with -unsafe. *) diff --git a/testsuite/tests/misc-unsafe/soli.ml b/testsuite/tests/misc-unsafe/soli.ml index 45dfd9d1f8..aba79b15b8 100644 --- a/testsuite/tests/misc-unsafe/soli.ml +++ b/testsuite/tests/misc-unsafe/soli.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: soli.ml 2553 1999-11-17 18:59:06Z xleroy $ *) +(* $Id$ *) type peg = Out | Empty | Peg diff --git a/testsuite/tests/misc/bdd.ml b/testsuite/tests/misc/bdd.ml index 2926e947db..8452b8c645 100644 --- a/testsuite/tests/misc/bdd.ml +++ b/testsuite/tests/misc/bdd.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: bdd.ml 7017 2005-08-12 09:22:04Z xleroy $ *) +(* $Id$ *) (* Translated to Caml by Xavier Leroy *) (* Original code written in SML by ... *) diff --git a/testsuite/tests/misc/boyer.ml b/testsuite/tests/misc/boyer.ml index c2c7689618..c5e829ff2c 100644 --- a/testsuite/tests/misc/boyer.ml +++ b/testsuite/tests/misc/boyer.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: boyer.ml 7017 2005-08-12 09:22:04Z xleroy $ *) +(* $Id$ *) (* Manipulations over terms *) diff --git a/testsuite/tests/misc/fib.ml b/testsuite/tests/misc/fib.ml index c7e7505850..7fad4bfdbc 100644 --- a/testsuite/tests/misc/fib.ml +++ b/testsuite/tests/misc/fib.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: fib.ml 7017 2005-08-12 09:22:04Z xleroy $ *) +(* $Id$ *) let rec fib n = if n < 2 then 1 else fib(n-1) + fib(n-2) diff --git a/testsuite/tests/misc/hamming.ml b/testsuite/tests/misc/hamming.ml index 2b85bdde73..7216ddb0d9 100644 --- a/testsuite/tests/misc/hamming.ml +++ b/testsuite/tests/misc/hamming.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: hamming.ml 4303 2002-01-23 17:50:20Z doligez $ *) +(* $Id$ *) (* We cannot use bignums because we don't do custom runtimes, but int64 is a bit short, so we roll our own 37-digit numbers... diff --git a/testsuite/tests/misc/nucleic.ml b/testsuite/tests/misc/nucleic.ml index 665e3ceb5f..e3adfd6228 100644 --- a/testsuite/tests/misc/nucleic.ml +++ b/testsuite/tests/misc/nucleic.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: nucleic.ml 7017 2005-08-12 09:22:04Z xleroy $ *) +(* $Id$ *) (* Use floating-point arithmetic *) diff --git a/testsuite/tests/misc/sieve.ml b/testsuite/tests/misc/sieve.ml index 450c84f4ce..994a4087d3 100644 --- a/testsuite/tests/misc/sieve.ml +++ b/testsuite/tests/misc/sieve.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: sieve.ml 7017 2005-08-12 09:22:04Z xleroy $ *) +(* $Id$ *) (* Eratosthene's sieve *) diff --git a/testsuite/tests/misc/sorts.ml b/testsuite/tests/misc/sorts.ml index 9aea623970..7ae00beff9 100644 --- a/testsuite/tests/misc/sorts.ml +++ b/testsuite/tests/misc/sorts.ml @@ -4476,4 +4476,4 @@ let main () = if not !Sys.interactive then Printexc.catch main ();; -(* $Id: sorts.ml 4955 2002-06-26 14:55:37Z doligez $ *) +(* $Id$ *) diff --git a/testsuite/tests/misc/takc.ml b/testsuite/tests/misc/takc.ml index 99aa6cde1c..8e49f24849 100644 --- a/testsuite/tests/misc/takc.ml +++ b/testsuite/tests/misc/takc.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: takc.ml 7017 2005-08-12 09:22:04Z xleroy $ *) +(* $Id$ *) let rec tak x y z = if x > y then tak (tak (x-1) y z) (tak (y-1) z x) (tak (z-1) x y) diff --git a/testsuite/tests/misc/taku.ml b/testsuite/tests/misc/taku.ml index c3eae9f9ef..555fb01c86 100644 --- a/testsuite/tests/misc/taku.ml +++ b/testsuite/tests/misc/taku.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: taku.ml 7017 2005-08-12 09:22:04Z xleroy $ *) +(* $Id$ *) let rec tak (x, y, z) = if x > y then tak(tak (x-1, y, z), tak (y-1, z, x), tak (z-1, x, y)) diff --git a/testsuite/tests/misc/weaktest.ml b/testsuite/tests/misc/weaktest.ml index 5dd4e19d41..92ab5576d3 100644 --- a/testsuite/tests/misc/weaktest.ml +++ b/testsuite/tests/misc/weaktest.ml @@ -1,4 +1,4 @@ -(* $Id: weaktest.ml 8766 2008-01-11 11:55:36Z doligez $ *) +(* $Id$ *) let debug = false;; diff --git a/testsuite/tests/regression-camlp4-class-type-plus/Makefile b/testsuite/tests/regression-camlp4-class-type-plus/Makefile new file mode 100644 index 0000000000..95106ce622 --- /dev/null +++ b/testsuite/tests/regression-camlp4-class-type-plus/Makefile @@ -0,0 +1,5 @@ +ADD_COMPFLAGS = -pp 'camlp4o' +MAIN_MODULE = camlp4_class_type_plus_ok + +include ../../makefiles/Makefile.okbad +include ../../makefiles/Makefile.common diff --git a/testsuite/tests/regression-camlp4-class-type-plus/camlp4_class_type_plus_ok.ml b/testsuite/tests/regression-camlp4-class-type-plus/camlp4_class_type_plus_ok.ml new file mode 100644 index 0000000000..79ba26d82e --- /dev/null +++ b/testsuite/tests/regression-camlp4-class-type-plus/camlp4_class_type_plus_ok.ml @@ -0,0 +1,9 @@ +type t;; +type xdr_value;; + +class type [ 't ] engine = object +end;; + +module type T = sig +class unbound_async_call : t -> [xdr_value] engine;; +end;; diff --git a/testsuite/tests/regression-pr5080-notes/Makefile b/testsuite/tests/regression-pr5080-notes/Makefile new file mode 100644 index 0000000000..149c289be3 --- /dev/null +++ b/testsuite/tests/regression-pr5080-notes/Makefile @@ -0,0 +1,5 @@ +ADD_COMPFLAGS = -pp 'camlp4o pa_macro.cmo' +MAIN_MODULE = pr5080_notes_ok + +include ../../makefiles/Makefile.okbad +include ../../makefiles/Makefile.common diff --git a/testsuite/tests/regression-pr5080-notes/pr5080_notes_ok.ml b/testsuite/tests/regression-pr5080-notes/pr5080_notes_ok.ml new file mode 100644 index 0000000000..175bc8b743 --- /dev/null +++ b/testsuite/tests/regression-pr5080-notes/pr5080_notes_ok.ml @@ -0,0 +1,4 @@ +let marshal_int f = + match [] with + | _ :: `INT n :: _ -> f n + | _ -> failwith "marshal_int" diff --git a/testsuite/tests/tool-lexyacc/.svnignore b/testsuite/tests/tool-lexyacc/.svnignore index 9cc5affaee..7345b4ea95 100644 --- a/testsuite/tests/tool-lexyacc/.svnignore +++ b/testsuite/tests/tool-lexyacc/.svnignore @@ -1,8 +1,20 @@ +#!/bin/sh + +svn propset svn:ignore -F - . <<EOF + +*.result +*.byte +*.native +program scanner.ml grammar.mli grammar.ml +<<<<<<< .working +<<<<<<< .working *.byte *.native *.result *.cm* *.o + +EOF diff --git a/testsuite/tests/tool-lexyacc/gram_aux.ml b/testsuite/tests/tool-lexyacc/gram_aux.ml index 6b23b5ece8..b84d8588a6 100644 --- a/testsuite/tests/tool-lexyacc/gram_aux.ml +++ b/testsuite/tests/tool-lexyacc/gram_aux.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: gram_aux.ml,v 1.4 1999/11/17 18:58:38 xleroy Exp $ *) +(* $Id$ *) (* Auxiliaries for the parser. *) diff --git a/testsuite/tests/tool-lexyacc/grammar.mly b/testsuite/tests/tool-lexyacc/grammar.mly index ee5a8d240f..8c1e4db943 100644 --- a/testsuite/tests/tool-lexyacc/grammar.mly +++ b/testsuite/tests/tool-lexyacc/grammar.mly @@ -10,7 +10,7 @@ /* */ /***********************************************************************/ -/* $Id: grammar.mly,v 1.4 1999/11/17 18:58:38 xleroy Exp $ */ +/* $Id$ */ /* The grammar for lexer definitions */ diff --git a/testsuite/tests/tool-lexyacc/input b/testsuite/tests/tool-lexyacc/input index 86114203ff..6793cb8745 100644 --- a/testsuite/tests/tool-lexyacc/input +++ b/testsuite/tests/tool-lexyacc/input @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: scanner.mll,v 1.5 1999/11/17 18:58:39 xleroy Exp $ *) +(* $Id$ *) (* The lexical analyzer for lexer definitions. *) diff --git a/testsuite/tests/tool-lexyacc/lexgen.ml b/testsuite/tests/tool-lexyacc/lexgen.ml index 05cb3c0333..bbd729b0f1 100644 --- a/testsuite/tests/tool-lexyacc/lexgen.ml +++ b/testsuite/tests/tool-lexyacc/lexgen.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: lexgen.ml,v 1.5 2000/12/28 13:06:39 weis Exp $ *) +(* $Id$ *) (* Compiling a lexer definition *) diff --git a/testsuite/tests/tool-lexyacc/main.ml b/testsuite/tests/tool-lexyacc/main.ml index 1dd130b932..d18a4886d2 100644 --- a/testsuite/tests/tool-lexyacc/main.ml +++ b/testsuite/tests/tool-lexyacc/main.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: main.ml,v 1.4 1999/11/17 18:58:39 xleroy Exp $ *) +(* $Id$ *) (* The lexer generator. Command-line parsing. *) diff --git a/testsuite/tests/tool-lexyacc/output.ml b/testsuite/tests/tool-lexyacc/output.ml index 6c56140895..09c66b6873 100644 --- a/testsuite/tests/tool-lexyacc/output.ml +++ b/testsuite/tests/tool-lexyacc/output.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: output.ml,v 1.5 2000/12/28 13:06:41 weis Exp $ *) +(* $Id$ *) (* Generating a DFA as a set of mutually recursive functions *) diff --git a/testsuite/tests/tool-lexyacc/scan_aux.ml b/testsuite/tests/tool-lexyacc/scan_aux.ml index 172d6f41ef..c449b13a59 100644 --- a/testsuite/tests/tool-lexyacc/scan_aux.ml +++ b/testsuite/tests/tool-lexyacc/scan_aux.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: scan_aux.ml,v 1.4 1999/11/17 18:58:39 xleroy Exp $ *) +(* $Id$ *) (* Auxiliaries for the lexical analyzer *) diff --git a/testsuite/tests/tool-lexyacc/scanner.mll b/testsuite/tests/tool-lexyacc/scanner.mll index c7d74b0185..131272fdd4 100644 --- a/testsuite/tests/tool-lexyacc/scanner.mll +++ b/testsuite/tests/tool-lexyacc/scanner.mll @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: scanner.mll,v 1.5 1999/11/17 18:58:39 xleroy Exp $ *) +(* $Id$ *) (* The lexical analyzer for lexer definitions. *) diff --git a/testsuite/tests/tool-lexyacc/syntax.ml b/testsuite/tests/tool-lexyacc/syntax.ml index 14d2987a18..ff704cd2f0 100644 --- a/testsuite/tests/tool-lexyacc/syntax.ml +++ b/testsuite/tests/tool-lexyacc/syntax.ml @@ -10,7 +10,7 @@ (* *) (***********************************************************************) -(* $Id: syntax.ml,v 1.4 1999/11/17 18:58:39 xleroy Exp $ *) +(* $Id$ *) (* The shallow abstract syntax *) diff --git a/testsuite/tests/tool-ocaml/lib.ml b/testsuite/tests/tool-ocaml/lib.ml index bf08b66ce4..557fc04ad2 100644 --- a/testsuite/tests/tool-ocaml/lib.ml +++ b/testsuite/tests/tool-ocaml/lib.ml @@ -1,4 +1,4 @@ -(* file $Id: lib.ml 6190 2004-04-06 09:11:45Z starynke $ *) +(* file $Id$ *) external raise : exn -> 'a = "%raise" @@ -43,4 +43,4 @@ external weak_get: 'a weak_t -> int -> 'a option = "caml_weak_get";; let x = 42;; -(* eof $Id: lib.ml 6190 2004-04-06 09:11:45Z starynke $ *) +(* eof $Id$ *) diff --git a/testsuite/tests/tool-ocaml/t301-object.ml b/testsuite/tests/tool-ocaml/t301-object.ml index 6cef9bedc5..5b053c0064 100644 --- a/testsuite/tests/tool-ocaml/t301-object.ml +++ b/testsuite/tests/tool-ocaml/t301-object.ml @@ -7,7 +7,7 @@ ocamlc -nostdlib -I ../../stdlib \ t301-object.ml -o t301-object.byte ***) -(* $Id: t301-object.ml 6363 2004-06-02 09:42:01Z basile $ *) +(* $Id$ *) class c = object (self) @@ -26,4 +26,4 @@ let (x,y,z) = f () in if y <> 2 then raise Not_found; if z <> 4 then raise Not_found;; -(**** eof $Id: t301-object.ml 6363 2004-06-02 09:42:01Z basile $ *) +(**** eof $Id$ *) diff --git a/testsuite/tests/tool-ocamldoc/odoc_test.ml b/testsuite/tests/tool-ocamldoc/odoc_test.ml index 8bd1127011..ba73fe52ed 100644 --- a/testsuite/tests/tool-ocamldoc/odoc_test.ml +++ b/testsuite/tests/tool-ocamldoc/odoc_test.ml @@ -9,7 +9,7 @@ (* *) (***********************************************************************) -(* $Id: odoc_test.ml 6127 2004-02-20 16:28:27Z guesdon $ *) +(* $Id$ *) (** Custom generator to perform test on ocamldoc. *) diff --git a/testsuite/tests/typing-fstclassmod/.svnignore b/testsuite/tests/typing-fstclassmod/.svnignore new file mode 100755 index 0000000000..4394099ffb --- /dev/null +++ b/testsuite/tests/typing-fstclassmod/.svnignore @@ -0,0 +1,10 @@ +#!/bin/sh + +svn propset svn:ignore -F - . <<EOF + +*.result +*.byte +*.native +program + +EOF diff --git a/testsuite/tests/typing-labels/.svnignore b/testsuite/tests/typing-labels/.svnignore new file mode 100755 index 0000000000..4394099ffb --- /dev/null +++ b/testsuite/tests/typing-labels/.svnignore @@ -0,0 +1,10 @@ +#!/bin/sh + +svn propset svn:ignore -F - . <<EOF + +*.result +*.byte +*.native +program + +EOF diff --git a/testsuite/tests/typing-labels/mixin.ml b/testsuite/tests/typing-labels/mixin.ml index 742bd59de0..83e7571f82 100644 --- a/testsuite/tests/typing-labels/mixin.ml +++ b/testsuite/tests/typing-labels/mixin.ml @@ -1,4 +1,4 @@ -(* $Id: mixin.ml 5929 2003-11-19 02:36:58Z garrigue $ *) +(* $Id$ *) open StdLabels open MoreLabels diff --git a/testsuite/tests/typing-labels/mixin2.ml b/testsuite/tests/typing-labels/mixin2.ml index edf20b6dd6..34d6bf50a9 100644 --- a/testsuite/tests/typing-labels/mixin2.ml +++ b/testsuite/tests/typing-labels/mixin2.ml @@ -1,4 +1,4 @@ -(* $Id: mixin2.ml 5929 2003-11-19 02:36:58Z garrigue $ *) +(* $Id$ *) (* Full fledge version, using objects to structure code *) diff --git a/testsuite/tests/typing-labels/mixin3.ml b/testsuite/tests/typing-labels/mixin3.ml index 5113eeb6f8..d8b037b7aa 100644 --- a/testsuite/tests/typing-labels/mixin3.ml +++ b/testsuite/tests/typing-labels/mixin3.ml @@ -1,4 +1,4 @@ -(* $Id: mixin3.ml 5929 2003-11-19 02:36:58Z garrigue $ *) +(* $Id$ *) (* Full fledge version, using objects to structure code *) diff --git a/testsuite/tests/typing-modules-bugs/Makefile b/testsuite/tests/typing-modules-bugs/Makefile new file mode 100644 index 0000000000..9375ddba6f --- /dev/null +++ b/testsuite/tests/typing-modules-bugs/Makefile @@ -0,0 +1,2 @@ +include ../../makefiles/Makefile.okbad +include ../../makefiles/Makefile.common diff --git a/testsuite/tests/typing-modules-bugs/pr5164_ok.ml b/testsuite/tests/typing-modules-bugs/pr5164_ok.ml new file mode 100644 index 0000000000..7de770ed6a --- /dev/null +++ b/testsuite/tests/typing-modules-bugs/pr5164_ok.ml @@ -0,0 +1,9 @@ +module type INCLUDING = sig + include module type of List + include module type of ListLabels +end + +module Including_typed: INCLUDING = struct + include List + include ListLabels +end diff --git a/testsuite/tests/typing-modules/Makefile b/testsuite/tests/typing-modules/Makefile new file mode 100644 index 0000000000..9add15574f --- /dev/null +++ b/testsuite/tests/typing-modules/Makefile @@ -0,0 +1,3 @@ +include ../../makefiles/Makefile.toplevel +include ../../makefiles/Makefile.common + diff --git a/testsuite/tests/typing-modules/Test.ml b/testsuite/tests/typing-modules/Test.ml new file mode 100644 index 0000000000..82ea468f9c --- /dev/null +++ b/testsuite/tests/typing-modules/Test.ml @@ -0,0 +1,5 @@ +module type S = sig type t and s = t end;; +module type S' = S with type t := int;; + +module type S = sig module rec M : sig end and N : sig end end;; +module type S' = S with module M := String;; diff --git a/testsuite/tests/typing-modules/Test.ml.reference b/testsuite/tests/typing-modules/Test.ml.reference new file mode 100644 index 0000000000..823cc1a840 --- /dev/null +++ b/testsuite/tests/typing-modules/Test.ml.reference @@ -0,0 +1,6 @@ + +# module type S = sig type t and s = t end +# module type S' = sig type s = int end +# module type S = sig module rec M : sig end and N : sig end end +# module type S' = sig module rec N : sig end end +# diff --git a/testsuite/tests/typing-objects-bugs/pr5156_ok.ml b/testsuite/tests/typing-objects-bugs/pr5156_ok.ml new file mode 100644 index 0000000000..ba8288da0a --- /dev/null +++ b/testsuite/tests/typing-objects-bugs/pr5156_ok.ml @@ -0,0 +1,10 @@ +class type t = object end;; +class ['a] o1 = object (self : #t as 'a) end;; +type 'a obj = ( < .. > as 'a);; +class type ['a] o2 = object ('a obj) end;; +class ['a] o3 = object (self : 'a obj) end;; +class ['a] o4 = object (self) method m = (self : 'a obj) end;; +(* +let o = object (self : 'a obj) end;; +let o = object (self) method m = (self : 'a obj) end;; +*) diff --git a/testsuite/tests/typing-objects/.svnignore b/testsuite/tests/typing-objects/.svnignore new file mode 100755 index 0000000000..4394099ffb --- /dev/null +++ b/testsuite/tests/typing-objects/.svnignore @@ -0,0 +1,10 @@ +#!/bin/sh + +svn propset svn:ignore -F - . <<EOF + +*.result +*.byte +*.native +program + +EOF diff --git a/testsuite/tests/typing-poly/.svnignore b/testsuite/tests/typing-poly/.svnignore new file mode 100755 index 0000000000..4394099ffb --- /dev/null +++ b/testsuite/tests/typing-poly/.svnignore @@ -0,0 +1,10 @@ +#!/bin/sh + +svn propset svn:ignore -F - . <<EOF + +*.result +*.byte +*.native +program + +EOF diff --git a/testsuite/tests/typing-poly/poly.ml b/testsuite/tests/typing-poly/poly.ml index 13c5363697..b5835b3daa 100644 --- a/testsuite/tests/typing-poly/poly.ml +++ b/testsuite/tests/typing-poly/poly.ml @@ -1,4 +1,4 @@ -(* $Id: poly.ml 9396 2009-10-26 07:11:36Z garrigue $ *) +(* $Id$ *) (* Polymorphic methods are now available in the main branch. Enjoy. diff --git a/testsuite/tests/typing-private/.svnignore b/testsuite/tests/typing-private/.svnignore new file mode 100755 index 0000000000..4394099ffb --- /dev/null +++ b/testsuite/tests/typing-private/.svnignore @@ -0,0 +1,10 @@ +#!/bin/sh + +svn propset svn:ignore -F - . <<EOF + +*.result +*.byte +*.native +program + +EOF diff --git a/testsuite/tests/typing-typeparam/.svnignore b/testsuite/tests/typing-typeparam/.svnignore new file mode 100755 index 0000000000..4394099ffb --- /dev/null +++ b/testsuite/tests/typing-typeparam/.svnignore @@ -0,0 +1,10 @@ +#!/bin/sh + +svn propset svn:ignore -F - . <<EOF + +*.result +*.byte +*.native +program + +EOF |