Merge pull request #39 from inhabitedtype/bench

bench: guard async and lwt benchmarks with flags
inhabitedtype · Jul 21, 2016 · a82f022 · a82f022
2 parents 6b17283 + 6cdc17f
commit a82f022
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/_oasis b/_oasis
@@ -95,15 +95,15 @@ Executable pure_benchmark
 Executable async_benchmark
   Path:             benchmarks
   MainIs:           async_benchmark.ml
-  Build$:           flag(benchmarks)
+  Build$:           flag(benchmarks) && flag(async)
   CompiledObject:   best
   Install:          false
   BuildDepends:     angstrom, angstrom.async, async, threads
 
 Executable lwt_benchmark
   Path:             benchmarks
   MainIs:           lwt_benchmark.ml
-  Build$:           flag(benchmarks)
+  Build$:           flag(benchmarks) && flag(lwt)
   CompiledObject:   best
   Install:          false
   BuildDepends:     angstrom, angstrom.lwt-unix, lwt.unix

diff --git a/setup.ml b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 9db94f52f9036e853f0a37754b91abfd) *)
+(* DO NOT EDIT (digest: 1980cb96102c72816298624b30429851) *)
 (*
    Regenerated by OASIS v0.4.6
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -7255,7 +7255,10 @@ let setup_t =
                       bs_build =
                         [
                            (OASISExpr.EBool true, false);
-                           (OASISExpr.EFlag "benchmarks", true)
+                           (OASISExpr.EAnd
+                              (OASISExpr.EFlag "benchmarks",
+                                OASISExpr.EFlag "async"),
+                             true)
                         ];
                       bs_install = [(OASISExpr.EBool true, false)];
                       bs_path = "benchmarks";
@@ -7288,7 +7291,10 @@ let setup_t =
                       bs_build =
                         [
                            (OASISExpr.EBool true, false);
-                           (OASISExpr.EFlag "benchmarks", true)
+                           (OASISExpr.EAnd
+                              (OASISExpr.EFlag "benchmarks",
+                                OASISExpr.EFlag "lwt"),
+                             true)
                         ];
                       bs_install = [(OASISExpr.EBool true, false)];
                       bs_path = "benchmarks";
@@ -7346,14 +7352,15 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.6";
-     oasis_digest = Some "^3\170C\252\246v\255\195,\190\146nv\234\186";
+     oasis_digest =
+       Some "\230#\182\248\023\142'r\246\025\193\255\160\149\191\181";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7358 "setup.ml"
+# 7365 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;