move benchmarks to benchs/ so they are separate from tests; use compiled oasis setup

This commit is contained in:
Simon Cruanes 2014-09-17 22:58:56 +02:00
parent 33d33ec6e4
commit 3a5f71a9e7
18 changed files with 46 additions and 7821 deletions

View file

@ -1,5 +1,5 @@
# OASIS_START # OASIS_START
# DO NOT EDIT (digest: 46f8bd9984975bd4727bed22d0876cd2) # DO NOT EDIT (digest: 9a60866e2fa295c5e33a3fe33b8f3a32)
SETUP = ./setup.exe SETUP = ./setup.exe
@ -38,7 +38,7 @@ configure: $(SETUP)
$(SETUP) -configure $(CONFIGUREFLAGS) $(SETUP) -configure $(CONFIGUREFLAGS)
setup.exe: setup.ml setup.exe: setup.ml
ocamlfind ocamlopt -o $@ $< || ocamlfind ocamlc -o $@ $< || true ocamlfind ocamlopt -o $@ -linkpkg -package oasis.dynrun $< || ocamlfind ocamlc -o $@ -linkpkg -package oasis.dynrun $< || true
$(RM) setup.cmi setup.cmo setup.cmx setup.o $(RM) setup.cmi setup.cmo setup.cmx setup.o
.PHONY: build doc test all install uninstall reinstall clean distclean configure .PHONY: build doc test all install uninstall reinstall clean distclean configure

17
_oasis
View file

@ -22,8 +22,7 @@ Description:
library full of experimental ideas (not stable, not necessarily usable). library full of experimental ideas (not stable, not necessarily usable).
Flag "misc" Flag "misc"
Description: Build the misc library, containing everything from Description: Build the misc library, containing everything from the rotating kitchen sink to automatic banana distributors
the rotating kitchen sink to automatic banana distributors
Default: false Default: false
Flag "cgi" Flag "cgi"
@ -137,7 +136,7 @@ Document containers_string
XOCamlbuildLibraries: containers.string XOCamlbuildLibraries: containers.string
Executable benchs Executable benchs
Path: tests/ Path: benchs/
Install: false Install: false
CompiledObject: native CompiledObject: native
Build$: flag(bench) Build$: flag(bench)
@ -145,7 +144,7 @@ Executable benchs
BuildDepends: containers,containers.string,containers.misc,bench BuildDepends: containers,containers.string,containers.misc,bench
Executable bench_conv Executable bench_conv
Path: tests/ Path: benchs/
Install: false Install: false
CompiledObject: native CompiledObject: native
Build$: flag(bench) Build$: flag(bench)
@ -153,7 +152,7 @@ Executable bench_conv
BuildDepends: containers,benchmark BuildDepends: containers,benchmark
Executable bench_batch Executable bench_batch
Path: tests/ Path: benchs/
Install: false Install: false
CompiledObject: native CompiledObject: native
Build$: flag(bench) Build$: flag(bench)
@ -161,7 +160,7 @@ Executable bench_batch
BuildDepends: containers,benchmark BuildDepends: containers,benchmark
Executable bench_hash Executable bench_hash
Path: tests/ Path: benchs/
Install: false Install: false
CompiledObject: native CompiledObject: native
Build$: flag(bench) && flag(misc) Build$: flag(bench) && flag(misc)
@ -174,7 +173,7 @@ Executable test_levenshtein
CompiledObject: native CompiledObject: native
Build$: flag(tests) Build$: flag(tests)
MainIs: test_levenshtein.ml MainIs: test_levenshtein.ml
BuildDepends: containers,qcheck BuildDepends: containers,qcheck,containers.string
Executable test_lwt Executable test_lwt
Path: tests/lwt/ Path: tests/lwt/
@ -202,8 +201,8 @@ Executable run_tests
Install: false Install: false
CompiledObject: native CompiledObject: native
MainIs: run_tests.ml MainIs: run_tests.ml
Build$: flag(tests) Build$: flag(tests) && flag(misc)
BuildDepends: containers, oUnit, qcheck BuildDepends: containers,oUnit,qcheck,containers.misc
Executable web_pwd Executable web_pwd
Path: examples/cgi/ Path: examples/cgi/

7834
setup.ml

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,7 @@
open OUnit open OUnit
open Containers_misc
open PiCalculus open PiCalculus
module Pi = PiCalculus module Pi = PiCalculus

View file

@ -1,5 +1,6 @@
open OUnit open OUnit
open Containers_misc
module B = Bencode module B = Bencode

View file

@ -1,5 +1,6 @@
open OUnit open OUnit
open Containers_misc
module Sequence = CCSequence module Sequence = CCSequence

View file

@ -1,5 +1,6 @@
open OUnit open OUnit
open Containers_misc
module Sequence = CCSequence module Sequence = CCSequence

View file

@ -1,5 +1,6 @@
open OUnit open OUnit
open Containers_misc
module Sequence = CCSequence module Sequence = CCSequence

View file

@ -3,6 +3,7 @@
open OUnit open OUnit
open Helpers open Helpers
open Containers_misc
module Sequence = CCSequence module Sequence = CCSequence
module G = PersistentGraph module G = PersistentGraph

View file

@ -2,6 +2,7 @@
open OUnit open OUnit
open Helpers open Helpers
open Containers_misc
module Sequence = CCSequence module Sequence = CCSequence
let test_empty () = let test_empty () =

View file

@ -1,5 +1,7 @@
(* quickcheck for Levenshtein *) (* quickcheck for Levenshtein *)
module Levenshtein = Containers_string.Levenshtein
(* test that automaton accepts its string *) (* test that automaton accepts its string *)
let test_automaton = let test_automaton =
let gen = QCheck.Arbitrary.(map string (fun s -> s, Levenshtein.of_string ~limit:1 s)) in let gen = QCheck.Arbitrary.(map string (fun s -> s, Levenshtein.of_string ~limit:1 s)) in

View file

@ -1,5 +1,6 @@
open OUnit open OUnit
open Containers_misc
module Sequence = CCSequence module Sequence = CCSequence

View file

@ -1,5 +1,6 @@
open OUnit open OUnit
open Containers_misc
module Sequence = CCSequence module Sequence = CCSequence

View file

@ -1,5 +1,6 @@
open OUnit open OUnit
open Containers_misc
(** Test Univ embedding *) (** Test Univ embedding *)