6 files changed, 45 insertions, 34 deletions
diff --git a/test/Moretest/morematch.ml b/test/Moretest/morematch.ml
index b8f00b81f1..e6a0a1cb60 100644
--- a/test/Moretest/morematch.ml
+++ b/test/Moretest/morematch.ml
@@ -1105,3 +1105,33 @@ let _  =
   test "luc"  f (B, A, A, A, A, A, A, A, A, A, A, B, A, A, A, A) "10" ;
   test "luc"  f (B, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A) "12" ;
  ()
+
+(*
+  By Gilles Peskine, compilation raised some assert false i make_failactionneg
+*)
+
+type bg = [
+  | `False
+  | `True
+  ]
+  
+type vg = [
+  | `A
+  | `B
+  | `U of int
+  | `V of int
+  ]
+
+type tg = {
+    v : vg;
+    x : bg;
+  }
+
+let predg x = true 
+
+let rec gilles o = match o with
+  | {v = (`U data | `V data); x = `False} when predg o -> 1
+  | {v = (`A|`B) ; x = `False}
+  | {v = (`U _ | `V _); x = `False}
+  | {v = _ ; x = `True}
+    -> 2
diff --git a/test/Moretest/tscanf.ml b/test/Moretest/tscanf.ml
index 38605fe5fc..0cb7658f75 100644
--- a/test/Moretest/tscanf.ml
+++ b/test/Moretest/tscanf.ml
@@ -789,6 +789,14 @@ let test42 () =
 
 test (test42 ());;
 
+let test50 () =
+ let s = "12.2" in
+ let ib = Scanning.from_string s in
+ bscanf ib "%[0-9].%[0-9]%s%!" (fun s1 s2 s3 ->
+   s1 = "12" && s2 = "2" && s3 = "");;
+
+test (test50 ());;
+
 (*******
 
 print_string "Test number is "; 
diff --git a/test/Results/fft.fast.runtest.Mac b/test/Results/fft.fast.runtest.Mac
deleted file mode 100644
index d54a175ac9..0000000000
--- a/test/Results/fft.fast.runtest.Mac
+++ /dev/null
@@ -1,12 +0,0 @@
-set echo 0
-
-if "{1}" == test
-  shift
-  set exit 0
-  {"parameters"} | search -r /e-[1-9][0-9]+�/
-  exit 0 if {status}
-  exit 2
-else if "{1}" == bench
-  shift
-  time {"parameters"} ">dev:null"
-end
diff --git a/test/Results/fft.runtest.Mac b/test/Results/fft.runtest.Mac
deleted file mode 100644
index d54a175ac9..0000000000
--- a/test/Results/fft.runtest.Mac
+++ /dev/null
@@ -1,12 +0,0 @@
-set echo 0
-
-if "{1}" == test
-  shift
-  set exit 0
-  {"parameters"} | search -r /e-[1-9][0-9]+�/
-  exit 0 if {status}
-  exit 2
-else if "{1}" == bench
-  shift
-  time {"parameters"} ">dev:null"
-end
diff --git a/test/Results/genlex.runtest.Mac b/test/Results/genlex.runtest.Mac
deleted file mode 100644
index 26a11620b2..0000000000
--- a/test/Results/genlex.runtest.Mac
+++ /dev/null
@@ -1,7 +0,0 @@
-if "{1}" == test
-  shift
-  {parameters} :Lex:testscanner.mll
-else if "{1}" == bench
-  shift
-  time {"parameters"} :Lex:testscanner.mll "�dev:null"
-end
diff --git a/test/testinterp/lib.ml b/test/testinterp/lib.ml
index 967d713c9e..557fc04ad2 100644
--- a/test/testinterp/lib.ml
+++ b/test/testinterp/lib.ml
@@ -1,3 +1,5 @@
+(* file $Id$ *)
+
 external raise : exn -> 'a = "%raise"
 
 external not : bool -> bool = "%boolnot"
@@ -35,8 +37,10 @@ external decr : int ref -> unit = "%decr"
 type 'a option = None | Some of 'a
 
 type 'a weak_t;;
-external weak_create: int -> 'a weak_t = "weak_create";;
-external weak_set : 'a weak_t -> int -> 'a option -> unit = "weak_set";;
-external weak_get: 'a weak_t -> int -> 'a option = "weak_get";;
+external weak_create: int -> 'a weak_t = "caml_weak_create";;
+external weak_set : 'a weak_t -> int -> 'a option -> unit = "caml_weak_set";;
+external weak_get: 'a weak_t -> int -> 'a option = "caml_weak_get";;
 
 let x = 42;;
+
+(* eof $Id$ *)