Browse Source

Re2 library is mandatory to run test

 + Reordered test dependencies to avoid such error in the future.
Leo 9 years ago
parent
commit
781000a2c0
4 changed files with 13 additions and 10 deletions
  1. 2 2
      INSTALL.md
  2. 1 1
      _oasis
  3. 4 2
      _tags
  4. 6 5
      setup.ml

+ 2 - 2
INSTALL.md

@@ -1,5 +1,5 @@
 <!--- OASIS_START --->
-<!--- DO NOT EDIT (digest: e39b2a56b1c8d15b002c554e90d54359) --->
+<!--- DO NOT EDIT (digest: 82837b65c0730b7a1c78065ed839afd8) --->
 
 This is the INSTALL file for the OcLaunch distribution.
 
@@ -16,7 +16,7 @@ In order to compile this package, you will need:
 * core
 * textutils
 * atdgen
-* re2 for executable oclaunch
+* re2
 * alcotest for executable run_test
 * oUnit for executable run_test
 

+ 1 - 1
_oasis

@@ -37,7 +37,7 @@ Executable "run_test"
   Build$: flag(tests)
   CompiledObject: best
   Install: false
-  BuildDepends: alcotest, oUnit, core, threads, textutils, atdgen
+  BuildDepends: alcotest, oUnit, core, textutils, atdgen, threads, re2
 
 Test "tests"
   Run$: flag(tests)

+ 4 - 2
_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: e83e83ffeca91f64ced159dafe6e0f0c)
+# DO NOT EDIT (digest: db4bdd27155ce9d25c2a54aac4c69750)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -20,24 +20,26 @@ true: annot, bin_annot
 <src/oclaunch.{native,byte}>: pkg_re2
 <src/oclaunch.{native,byte}>: pkg_textutils
 <src/oclaunch.{native,byte}>: pkg_threads
-<src/*.ml{,i,y}>: pkg_re2
 # Executable run_test
 <src/test/test.{native,byte}>: pkg_alcotest
 <src/test/test.{native,byte}>: pkg_atdgen
 <src/test/test.{native,byte}>: pkg_core
 <src/test/test.{native,byte}>: pkg_oUnit
+<src/test/test.{native,byte}>: pkg_re2
 <src/test/test.{native,byte}>: pkg_textutils
 <src/test/test.{native,byte}>: pkg_threads
 <src/*.ml{,i,y}>: pkg_alcotest
 <src/*.ml{,i,y}>: pkg_atdgen
 <src/*.ml{,i,y}>: pkg_core
 <src/*.ml{,i,y}>: pkg_oUnit
+<src/*.ml{,i,y}>: pkg_re2
 <src/*.ml{,i,y}>: pkg_textutils
 <src/*.ml{,i,y}>: pkg_threads
 <src/test/*.ml{,i,y}>: pkg_alcotest
 <src/test/*.ml{,i,y}>: pkg_atdgen
 <src/test/*.ml{,i,y}>: pkg_core
 <src/test/*.ml{,i,y}>: pkg_oUnit
+<src/test/*.ml{,i,y}>: pkg_re2
 <src/test/*.ml{,i,y}>: pkg_textutils
 <src/test/*.ml{,i,y}>: pkg_threads
 # OASIS_STOP

+ 6 - 5
setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 2968af268cc8684286de0fd558b52a72) *)
+(* DO NOT EDIT (digest: 29148222c3727c6a2e17ba86cbb4f853) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6964,9 +6964,10 @@ let setup_t =
                            FindlibPackage ("alcotest", None);
                            FindlibPackage ("oUnit", None);
                            FindlibPackage ("core", None);
-                           FindlibPackage ("threads", None);
                            FindlibPackage ("textutils", None);
-                           FindlibPackage ("atdgen", None)
+                           FindlibPackage ("atdgen", None);
+                           FindlibPackage ("threads", None);
+                           FindlibPackage ("re2", None)
                         ];
                       bs_build_tools =
                         [ExternalTool "ocamlbuild"; ExternalTool "camlp4o"];
@@ -7020,7 +7021,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "*\000\233\133\151\248>\222\145\185J\129X\157vP";
+     oasis_digest = Some "\029\r\237\218zXPf\207\238d\143\005\003\189s";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
@@ -7028,6 +7029,6 @@ let setup_t =
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7032 "setup.ml"
+# 7033 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;