Fix test-suite scripts: [Generalizable Variables] and small

changes in obligations.


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12514 85f007b7-540e-0410-9357-904b9bb8a0f7

4 files changed, 10 insertions, 2 deletions

diff --git a/test-suite/success/AdvancedTypeClasses.v b/test-suite/success/AdvancedTypeClasses.v
index 219a8a755..a6f1e299b 100644
--- a/test-suite/success/AdvancedTypeClasses.v
+++ b/test-suite/success/AdvancedTypeClasses.v
@@ -1,3 +1,5 @@
+Generalizable Variables all.
+
 Open Scope type_scope.
 
 Section type_reification.
diff --git a/test-suite/success/Generalization.v b/test-suite/success/Generalization.v
index 6b503e95a..4ec0a79ba 100644
--- a/test-suite/success/Generalization.v
+++ b/test-suite/success/Generalization.v
@@ -1,3 +1,4 @@
+Generalizable Variables all.
 
 Check `(a = 0).
 Check `(a = 0)%type.
diff --git a/test-suite/success/ProgramWf.v b/test-suite/success/ProgramWf.v
index 18111f07c..81bdbc29f 100644
--- a/test-suite/success/ProgramWf.v
+++ b/test-suite/success/ProgramWf.v
@@ -56,7 +56,10 @@ Lemma merge_unfold n m : merge n m =
     | 0 => 0
     | S n' => merge n' m
   end.
-Proof. intros. unfold_sub merge (merge n m). simpl. destruct n ; reflexivity. Qed.
+Proof. intros. unfold merge at 1. unfold merge_func. 
+  unfold_sub merge (merge n m).
+  simpl. destruct n ; reflexivity. 
+Qed.
 
 Print merge.
 
diff --git a/test-suite/success/dependentind.v b/test-suite/success/dependentind.v
index f308bdfd9..a19515d06 100644
--- a/test-suite/success/dependentind.v
+++ b/test-suite/success/dependentind.v
@@ -1,4 +1,4 @@
-Require Import Coq.Program.Program Coq.Program.Equations.
+Require Import Coq.Program.Program Coq.Program.Equality.
 
 Variable A : Set.
 
@@ -50,6 +50,8 @@ Notation " Γ  ; Δ " := (conc Δ Γ) (at level 25, left associativity) : contex
 
 Reserved Notation " Γ ⊢ τ " (at level 30, no associativity).
 
+Generalizable Variables all.
+
 Inductive term : ctx -> type -> Type :=
 | ax : `(Γ, τ ⊢ τ)
 | weak : `{Γ ⊢ τ -> Γ, τ' ⊢ τ}