summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmaël Guéneau <armael.gueneau@ens-lyon.fr>2018-01-24 13:44:43 +0100
committerArmaël Guéneau <armael.gueneau@ens-lyon.fr>2018-02-01 14:07:56 +0100
commit66d0cb124b752e8d7683ed703f74bf2f6f5fdb6c (patch)
treec86bec6182c9908afe1da45ff33121745457aadd
parent28a62146e71b1d54c85ab9f42d696cbb6a2ae220 (diff)
downloadocaml-66d0cb124b752e8d7683ed703f74bf2f6f5fdb6c.tar.gz
Migrate test "typing-labels" to ocamltest
-rw-r--r--testsuite/tests/typing-labels/Makefile18
-rw-r--r--testsuite/tests/typing-labels/mixin.ml2
-rw-r--r--testsuite/tests/typing-labels/mixin2.ml2
-rw-r--r--testsuite/tests/typing-labels/mixin3.ml2
-rw-r--r--testsuite/tests/typing-labels/ocamltests3
5 files changed, 9 insertions, 18 deletions
diff --git a/testsuite/tests/typing-labels/Makefile b/testsuite/tests/typing-labels/Makefile
deleted file mode 100644
index c11a415f74..0000000000
--- a/testsuite/tests/typing-labels/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-#**************************************************************************
-#* *
-#* OCaml *
-#* *
-#* Xavier Clerc, SED, INRIA Rocquencourt *
-#* *
-#* Copyright 2010 Institut National de Recherche en Informatique et *
-#* en Automatique. *
-#* *
-#* All rights reserved. This file is distributed under the terms of *
-#* the GNU Lesser General Public License version 2.1, with the *
-#* special exception on linking described in the file LICENSE. *
-#* *
-#**************************************************************************
-
-BASEDIR=../..
-include $(BASEDIR)/makefiles/Makefile.several
-include $(BASEDIR)/makefiles/Makefile.common
diff --git a/testsuite/tests/typing-labels/mixin.ml b/testsuite/tests/typing-labels/mixin.ml
index 5ca686a118..6df06748f7 100644
--- a/testsuite/tests/typing-labels/mixin.ml
+++ b/testsuite/tests/typing-labels/mixin.ml
@@ -1,3 +1,5 @@
+(* TEST *)
+
open StdLabels
open MoreLabels
diff --git a/testsuite/tests/typing-labels/mixin2.ml b/testsuite/tests/typing-labels/mixin2.ml
index fd2b289796..637a677a29 100644
--- a/testsuite/tests/typing-labels/mixin2.ml
+++ b/testsuite/tests/typing-labels/mixin2.ml
@@ -1,3 +1,5 @@
+(* TEST *)
+
(* Full fledge version, using objects to structure code *)
open StdLabels
diff --git a/testsuite/tests/typing-labels/mixin3.ml b/testsuite/tests/typing-labels/mixin3.ml
index 5b987e8198..d5f8c92209 100644
--- a/testsuite/tests/typing-labels/mixin3.ml
+++ b/testsuite/tests/typing-labels/mixin3.ml
@@ -1,3 +1,5 @@
+(* TEST *)
+
(* Full fledge version, using objects to structure code *)
open StdLabels
diff --git a/testsuite/tests/typing-labels/ocamltests b/testsuite/tests/typing-labels/ocamltests
new file mode 100644
index 0000000000..b73143b28b
--- /dev/null
+++ b/testsuite/tests/typing-labels/ocamltests
@@ -0,0 +1,3 @@
+mixin2.ml
+mixin3.ml
+mixin.ml