topkg: use test support.

README.md

@@ -41,12 +41,3 @@ distribution.
 
 If you installed Astring with `opam` sample programs are located in
 the directory `opam config var astring:doc`.
-
-In the distribution sample programs are located in the `test`
-directory of the distribution. They can be built with:
-
-    ocamlbuild -use-ocamlfind test/tests.otarget
-
-The resulting binaries are in `_build/test`.
-
-- `test.native` tests the library, nothing should fail.

build

@@ -12,13 +12,10 @@ action ()
     case $1 in
         default) action lib;;
         lib) $OCAMLBUILD astring.cma astring.cmxa ;;
-        test|tests)
-            action lib
-            $OCAMLBUILD test/tests.otarget
-            ;;
+        test|tests) topkg build && topkg teste ;;
         doc)     shift; topkg doc --dev $* ;;
         api-doc) shift; topkg doc $* ;;
-        clean)   $OCAMLBUILD -clean ;;
+        clean)   topkg clean ;;
         *)       $OCAMLBUILD $* ;;
     esac
 }

opam

@@ -2,7 +2,7 @@ opam-version: "1.2"
 maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
 authors: ["Daniel Bünzli <daniel.buenzl i@erratique.ch>"]
 homepage: "http://erratique.ch/software/astring"
-doc: "http://erratique.ch/software/astring"
+doc: "http://erratique.ch/software/astring/doc"
 dev-repo: "http://erratique.ch/repos/astring.git"
 bug-reports: "https://github.com/dbuenzli/astring/issues"
 tags: [ "string" "org:erratique" ]

pkg/pkg.ml

@@ -8,4 +8,6 @@ let () =
   Ok [ Pkg.mllib ~api:["Astring"] "src/astring.mllib";
        Pkg.mllib ~api:[] "src/astring_top.mllib";
        Pkg.lib "src/astring_top_init.ml";
-       Pkg.doc "test/examples.ml"; ]
+       Pkg.doc "test/examples.ml";
+       Pkg.test "test/test";
+       Pkg.test "test/examples"; ]